Partial backout of 34504.  I know this will regress the *-data-url.html test, but I'd like to see if it fixes the broken test.
Partial backout of 34504.  I know this will regress the *-data-url.html test, but I'd like to see if it fixes the broken test.

git-svn-id: bf5cd6ccde378db821296732a091cfbcf5285fbd@34511 bbb929c8-8fbe-4397-9dbb-9b2b20218538
primiano/blink-gitcs,primiano/blink-gitcs,primiano/blink-gitcs,primiano/blink-gitcs,primiano/blink-gitcs,primiano/blink-gitcs,primiano/blink-gitcs,primiano/blink-gitcs,primiano/blink-gitcs