The commit for this was accidentally given a separate ticket number, 
7598.  Closing this ticket.