I was trying to be a good human being and do some PR review, but unfortunately I uncovered a more serious bug in the course of testing this (CRM-21089). My time unfortunately got sucked into writing a fix for that. I'll try to review this later in the week.