Revert change 1656 which was unsafe until it can be properly fixed.
Revert change 1656 which was unsafe until it can be properly fixed.

TBR=whesse@chromium.org
Review URL: http://codereview.chromium.org/60010

git-svn-id: b158db1e4b4ab85d4c9e510fdef4b1e8c614b15b@1666 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

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