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

Built from https://develop.svn.wordpress.org/trunk@28601


git-svn-id: http://core.svn.wordpress.org/trunk@28426 1a063a9b-81f0-0310-95a4-ce76da25c4cd