Polyfill now takes origin into account