Revert r191940 to see if it fixes the build bots.