This reverts commit bd97704eaa. It broke tests on mac: http://45.33.8.238/mac/9011/step_7.txt
bd97704eaa