Reverted r171893, because it broke http/tests/appcache/different-https-origin-resourc...