Fixes #35661. Props @hugobaeta. Built from https://develop.svn.wordpress.org/trunk@36910 git-svn-id: http://core.svn.wordpress.org/trunk@36878 1a063a9b-81f0-0310-95a4-ce76da25c4cd