Revert [29033] pending further discussion. See #28319.
Built from https://develop.svn.wordpress.org/trunk@29046


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