Revert [25622]. fixes #25445. see #25122.

git-svn-id: https://develop.svn.wordpress.org/trunk@25687 602fd350-edb4-49c9-b593-d223f7449a82