3e0af4b4a9
Reverting this for now till we figure out how to avoid the build
breakage.
This reverts commit acb2ea8618.