I have fixed the underlying XPConnect issue, so these workarounds should no longer be needed. There are also two more in browser/base/content/browser-siteProtections.js that I have not fixed. Differential Revision: https://phabricator.services.mozilla.com/D158158