d032637934
Reverting this for now till we figure out how to avoid the build
breakage.
This reverts commit 262ad13dd5.