Revert commit r239480 as it causes https://code.google.com/p/chromium/issues/detail...