Switched back to no-polyfill