Submit the second part of the revert.
Submit the second part of the revert.

Review URL: http://codereview.chromium.org/155907

git-svn-id: http://src.chromium.org/svn/trunk/src@21264 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

Former-commit-id: ec33c2b9a893ac3703cd91ca51e13d7e8d9855a9
meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser