Revert r131644; it's breaking the build.