Revert commit r63086.
4 files changed