Fix for various content script timing related issues.

2 files changed, 3 insertions, 4 deletions

diff --git a/src/content/content.js b/src/content/content.js
index c501282..b185f4f 100644
--- a/src/content/content.js
+++ b/src/content/content.js
@@ -54,8 +54,7 @@ var notifyPage = async () => {
           debug(`No answer to fetchChildPolicy message. This should not be happening.`);
           return;
         }
-        ns.config.CURRENT = childPolicy.CURRENT;
-        ns.setup(childPolicy.DEFAULT, childPolicy.MARKER);
+        ns.setup(childPolicy.CURRENT, childPolicy.MARKER);
         return;
       }
 
diff --git a/src/content/dynamicNS.js b/src/content/dynamicNS.js
index cdd7a0e..f865e8b 100644
--- a/src/content/dynamicNS.js
+++ b/src/content/dynamicNS.js
@@ -7,8 +7,8 @@ if (!this.ns) {
   let deferredSetup = null;
   let nsStub = this.ns = {
     config: {},
-    setup(DEFAULT, MARKER) {
-      deferredSetup = [DEFAULT, MARKER];
+    setup(CURRENT, MARKER) {
+      deferredSetup = [CURRENT, MARKER];
     },
     merge: ns => {
       ns.config = Object.assign(ns.config, nsStub.config);