Revert part of 182516: it broke tests
Created attachment 250450 [details] Patch
https://trac.webkit.org/r182605