The fix is apparently not good: we have test failures with chrome.