update to use toolkit wrapper from polyfill component