Follow-up to [20319], [30309], [31698], [32023], [49679]. Props subrataemfluence. Fixes #44411. Built from https://develop.svn.wordpress.org/trunk@49680 git-svn-id: http://core.svn.wordpress.org/trunk@49403 1a063a9b-81f0-0310-95a4-ce76da25c4cd