Revert [28579] and [28582]. see #21963.


git-svn-id: https://develop.svn.wordpress.org/trunk@28601 602fd350-edb4-49c9-b593-d223f7449a82