Rolled out 147820 and 147818 because they caused plugins tests to ASSERT
Created attachment 196746 [details] Patch
Committed r147846: <http://trac.webkit.org/changeset/147846>