Typoed ticket number in r23648; that was the 1.8 branch pull up that should have gone to this 
ticket.