Do a partial rollout of r205315 to unbreak testing.
Created attachment 287832 [details] Patch
Committed r205383: <http://trac.webkit.org/changeset/205383>