Revert r82089.  Commit was intended for a branch.
7 files changed