[chromium] Partial revert of r104566.
Created attachment 121909 [details] Patch
Committed r104632: <http://trac.webkit.org/changeset/104632>