Revert [30036].

see #18035
Built from https://develop.svn.wordpress.org/trunk@30912


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