revert r6938

(i.e. reapply 6935, with fix)
Review URL: http://codereview.chromium.org/14087

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6953 0039d316-1c4b-4281-b951-d872f2087c98
5 files changed