Revert r55859. This is breaking the build in the abscence of its companion commit.