Fixes #32801. Built from https://develop.svn.wordpress.org/trunk@33013 git-svn-id: http://core.svn.wordpress.org/trunk@32984 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Built from https://develop.svn.wordpress.org/trunk@27428 git-svn-id: http://core.svn.wordpress.org/trunk@27275 1a063a9b-81f0-0310-95a4-ce76da25c4cd