Revert http://trac.webkit.org/r251875