diff --git a/‎src/standard/x-styling.html‎
Lines changed: 8 additions & 8 deletions b/‎src/standard/x-styling.html‎
Lines changed: 8 additions & 8 deletions
diff --git a/‎test/unit/styling-cross-scope-var.html‎
Lines changed: 2 additions & 2 deletions b/‎test/unit/styling-cross-scope-var.html‎
Lines changed: 2 additions & 2 deletions
@@ -53,7 +53,9 @@
      */
       getComputedStyleValue: function(property) {
         // refresh the style properties for this node
-        this._updateStyleProperties();
+        if (!nativeVariables) {
+          this._computeStyleProperties();
+        }
         return !nativeVariables && this._styleProperties &&
           this._styleProperties[property] ||
           getComputedStyle(this).getPropertyValue(property);
@@ -214,14 +216,12 @@
       },
 
       _computeOwnStyleProperties: function() {
-        if (this._ownStylePropertyNames) {
-          var props = {};
-          for (var i=0, n; i < this._ownStylePropertyNames.length; i++) {
-            n = this._ownStylePropertyNames[i];
-            props[n] = this._styleProperties[n];
-          }
-          this._ownStyleProperties = props;
+        var props = {};
+        for (var i=0, n; i < this._ownStylePropertyNames.length; i++) {
+          n = this._ownStylePropertyNames[i];
+          props[n] = this._styleProperties[n];
         }
+        this._ownStyleProperties = props;
       },
 
       _scopeCount: 0,
 
@@ -1336,8 +1336,8 @@
     var e = document.createElement('prop-outer');
     document.body.appendChild(e);
     CustomElements.takeRecords();
-    assert.equal(e.getComputedStyleValue('--foo'), 'orange');
-    assert.equal(e.$.inner.getComputedStyleValue('--foo'), 'orange');
+    assert.equal(e.getComputedStyleValue('--foo').trim(), 'orange');
+    assert.equal(e.$.inner.getComputedStyleValue('--foo').trim(), 'orange');
   })
 });