Revert [28963].

see #28006.
Built from https://develop.svn.wordpress.org/trunk@29235


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