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