Revert [27609] from the 3.8 branch, as it should have been applied to trunk. see #27453.

Built from https://develop.svn.wordpress.org/branches/3.8@27889


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