Revert r83327.  This will have to wait until after the alpha1 release.
4 files changed