Revert [25663] for UX discussion
Built from https://develop.svn.wordpress.org/trunk@25667


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