Revert [29267], as it causes unit test breakage and appears unnecessary. see #28986.

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


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