Revert r179409 because it caused some warnings and some of the build bots fail.