Revert [24291] pending further discussion and sleuthing. see #24364.



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