modded core to account for Google polyfill change