diff --git a/lib/mixins/element-mixin.js b/lib/mixins/element-mixin.js
index 27318a766f..f07ce7f9e3 100644
--- a/lib/mixins/element-mixin.js
+++ b/lib/mixins/element-mixin.js
@@ -9,14 +9,13 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 */
 import '../utils/boot.js';
 
-import { rootPath } from '../utils/settings.js';
+import { rootPath, strictTemplatePolicy, allowTemplateFromDomModule } from '../utils/settings.js';
 import { dedupingMixin } from '../utils/mixin.js';
 import { stylesFromTemplate, stylesFromModuleImports } from '../utils/style-gather.js';
 import { pathFromUrl, resolveCss, resolveUrl } from '../utils/resolve-url.js';
 import { DomModule } from '../elements/dom-module.js';
 import { PropertyEffects } from './property-effects.js';
 import { PropertiesMixin } from './properties-mixin.js';
-import { strictTemplatePolicy, allowTemplateFromDomModule } from '../utils/settings.js';
 
 /**
  * Current Polymer version in Semver notation.
diff --git a/polymer-element.js b/polymer-element.js
index 0b9dd241d3..1179d6872b 100644
--- a/polymer-element.js
+++ b/polymer-element.js
@@ -8,10 +8,11 @@ Code distributed by Google as part of the polymer project is also
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 */
 
-import { ElementMixin } from './lib/mixins/element-mixin.js';
-export { version } from './lib/mixins/element-mixin.js';
+import { ElementMixin, version } from './lib/mixins/element-mixin.js';
 export { html } from './lib/utils/html-tag.js';
 
+export { version };
+
 /**
  * Base class that provides the core API for Polymer's meta-programming
  * features including template stamping, data-binding, attribute deserialization,