Revert [25622]. fixes #25445. see #25122.
Built from https://develop.svn.wordpress.org/trunk@25687


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