Revert [28948], which caused a regression.

see #29573 for trunk. see #28350.
Built from https://develop.svn.wordpress.org/trunk@30791


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