Updated for Safari Extension
Revert to 2790fc5599