Revert r171427, "An intermediate step in the Attributes rewrite."