diff --git a/define-element.html b/define-element.html
index ab432a78..1c6595fb 100644
--- a/define-element.html
+++ b/define-element.html
@@ -159,10 +159,7 @@
         if (template) {
           var domModule = document.createElement('dom-module');
           var assetpath = typeof URL === 'function' && URL.name === 'URL'
-            ? new URL((current ? current.baseURI : null) ||
-                (window.currentImport ? window.currentImport.baseURI : null) ||
-                baseURI ||
-                document.baseURI).pathname
+            ? new URL(baseURI || document.baseURI).pathname
             : (uri => { let a = document.createElement('a'); a.href = uri; return ('/' + a.pathname).replace(/^\/\//, '/'); })(baseURI);
           domModule.appendChild(template);
           domModule.setAttribute('assetpath', 
diff --git a/i18n-element.html b/i18n-element.html
index 1055ba68..cda90b59 100644
--- a/i18n-element.html
+++ b/i18n-element.html
@@ -63,10 +63,7 @@
         if (template) {
           let domModule = document.createElement('dom-module');
           let assetpath = typeof URL === 'function' && URL.name === 'URL'
-            ? new URL((current ? current.baseURI : null) ||
-                (window.currentImport ? window.currentImport.baseURI : null) ||
-                baseURI ||
-                document.baseURI).pathname
+            ? new URL(baseURI || document.baseURI).pathname
             : (uri => { let a = document.createElement('a'); a.href = uri; return ('/' + a.pathname).replace(/^\/\//, '/'); })(baseURI);
           domModule.appendChild(template);
           domModule.setAttribute('assetpath',