Revert r63934 -- it was mixing two patches.
37 files changed