This change may not be needed and further investigation is required before we accept it into a release. See #46907. Built from https://develop.svn.wordpress.org/trunk@46191 git-svn-id: http://core.svn.wordpress.org/trunk@46003 1a063a9b-81f0-0310-95a4-ce76da25c4cd