Partially revert http://trac.webkit.org/r200504