Removed polyfills by defect, now it's optional