Undo r189834 - broke test.