Revert [30036].

Merges [30912] to the 4.1 branch.

see #18035
Built from https://develop.svn.wordpress.org/branches/4.1@30913


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30903 1a063a9b-81f0-0310-95a4-ce76da25c4cd