Revert [28948] for the 4.0 branch, which caused a regression.

see #29573 for 4.0. see #28350.

Built from https://develop.svn.wordpress.org/branches/4.0@30410


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