reverting r252916 to investigate test failure