Revert part of r24098
Revert part of r24098

BUG=chromium:417508
LOG=y
R=mvstanton@chromium.org

Review URL: https://codereview.chromium.org/604703006

git-svn-id: f98b9d40cb02301bc76fa9e1b46ee668158567fd@24221 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

UniversalFuture/moosh,UniversalFuture/moosh,UniversalFuture/moosh,UniversalFuture/moosh