f8e1c01900
Reverting this for now till we figure out how to avoid the build
breakage.
This reverts commit fa98798b63.