Refactoring to use Pointer Events shim.