r25465-53252eeb3b
