diff --git a/src/lib/apply-shim.html b/src/lib/apply-shim.html
index 453d862672..941c46c680 100644
--- a/src/lib/apply-shim.html
+++ b/src/lib/apply-shim.html
@@ -126,7 +126,7 @@
     var currentElementName = currentProto && currentProto.is;
     for (var elementName in mixinEntry.dependants) {
       if (elementName !== currentElementName) {
-        mixinEntry.dependants[elementName].__mixinsInvalid = true;
+        mixinEntry.dependants[elementName].__applyShimInvalid = true;
       }
     }
   }
@@ -246,7 +246,7 @@
     transform: function(styles, elementProto) {
       this.__currentElementProto = elementProto;
       styleUtil.forRulesInStyles(styles, this._boundTransformRule);
-      elementProto.__mixinsInvalid = false;
+      elementProto.__applyShimInvalid = false;
       this.__currentElementProto = null;
     },
     transformRule: function(rule) {
diff --git a/src/lib/custom-style.html b/src/lib/custom-style.html
index bb33fe6f68..3ffb0d2296 100644
--- a/src/lib/custom-style.html
+++ b/src/lib/custom-style.html
@@ -209,7 +209,6 @@
       }
       var styleRules = styleUtil.rulesForStyle(e);
       if (!targetedBuild) {
-        applyShim.__currentElementProto = this.__proto__;
         styleUtil.forEachRule(styleRules,
           function(rule) {
             // shim the selector for current runtime settings
@@ -220,7 +219,6 @@
             }
           }
         );
-        applyShim.__currentElementProto = null;
       }
       // custom properties shimming
       // (if we use native custom properties, no need to apply any property shimming)
diff --git a/src/standard/x-styling.html b/src/standard/x-styling.html
index bbdee7c2a7..f658592380 100644
--- a/src/standard/x-styling.html
+++ b/src/standard/x-styling.html
@@ -75,7 +75,7 @@
       },
 
       _validateApplyShim: function() {
-        if (this.__mixinsInvalid) {
+        if (this.__applyShimInvalid) {
           // rerun apply shim
           Polymer.ApplyShim.transform(this._styles, this.__proto__);
           var cssText = styleTransformer.elementStyles(this);