Update to use new polyfill