This reverts commit fc62b36a00. Breaks tests on mac: http://45.33.8.238/mac/7301/step_11.txt
fc62b36a00