Props dlh, munyagu, rishishah. Fixes #42565. Built from https://develop.svn.wordpress.org/trunk@42568 git-svn-id: http://core.svn.wordpress.org/trunk@42397 1a063a9b-81f0-0310-95a4-ce76da25c4cd