Switch to use the new polyfill