Revert polyfill implementation
Merge pull request #4268 from guardian/remove-polyfill

Revert polyfill implementation