Revert r43399.
4 files changed