diff --git a/externs/closure-types.js b/externs/closure-types.js
index 5159c4d1c2..0cabb51658 100644
--- a/externs/closure-types.js
+++ b/externs/closure-types.js
@@ -1374,19 +1374,4 @@ Polymer_ArraySelectorMixin.prototype.select = function(item){};
 * @param {number} idx Index from `items` array to select
 * @return {void}
 */
-Polymer_ArraySelectorMixin.prototype.selectIndex = function(idx){};
-/**
-* @interface
-* @extends {Polymer_PropertyEffects}
-*/
-function Polymer_AttributeCapitalization(){}
-/**
-* @override
-* @param {Node} node Node to parse
-* @param {TemplateInfo} templateInfo Template metadata for current template
-* @param {NodeInfo} nodeInfo Node metadata for current template node
-* @param {*} name 
-* @param {*} value 
-* @return {boolean}
-*/
-Polymer_AttributeCapitalization._parseTemplateNodeAttribute = function(node, templateInfo, nodeInfo, name, value){};
\ No newline at end of file
+Polymer_ArraySelectorMixin.prototype.selectIndex = function(idx){};
\ No newline at end of file
diff --git a/lib/mixins/property-effects.html b/lib/mixins/property-effects.html
index 2afd52319e..cdcf0ed32a 100644
--- a/lib/mixins/property-effects.html
+++ b/lib/mixins/property-effects.html
@@ -43,6 +43,9 @@
     READ_ONLY: '__readOnly'
   };
 
+  /** @const {string} */
+  const capitalAttributeRegex = /[A-Z]/;
+
   /**
    * @typedef {{
    * name: (string | undefined),
@@ -2530,7 +2533,9 @@
           // Attribute or property
           let origName = name;
           let kind = 'property';
-          if (name[name.length-1] == '$') {
+          if (capitalAttributeRegex.test(name)) {
+            kind = 'attribute';
+          } else if (name[name.length-1] == '$') {
             name = name.slice(0, -1);
             kind = 'attribute';
           }
diff --git a/lib/utils/attribute-capitalization-mixin.html b/lib/utils/attribute-capitalization-mixin.html
deleted file mode 100644
index d3d856789d..0000000000
--- a/lib/utils/attribute-capitalization-mixin.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<!--
-@license
-Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-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
--->
-<link rel="import" href="boot.html">
-<link rel="import" href="mixin.html">
-<link rel="import" href="../mixins/property-effects.html">
-
-<script>
-(function() {
-
-  'use strict';
-
-  const regex = /[A-Z]/;
-
-  /**
-   * Mixin that uses an heuristic to determine the capitalization of HTML
-   * attributes. By default, all attributes are lowercased. However, some
-   * native attributes have capitalization. `Element.attributes` only returns
-   * capitalized attributes if the attribute name is exactly equal to the attribute.
-   * In other words, `viewBox$` will be lowercased to `viewbox$`. Therefore, if
-   * an attribute name still has capitaliation, we use an attribute effect to
-   * update the bindings.
-   *
-   * @mixinFunction
-   * @polymer
-   * @appliesMixin Polymer.PropertyEffects
-   * @memberof Polymer
-   * @summary Class mixin that uses an heuristic to determine the capitalization
-   * of HTML attributes.
-   */
-  Polymer.AttributeCapitalization = Polymer.dedupingMixin(superClass => {
-
-    /**
-     * @constructor
-     * @extends {superClass}
-     * @implements {Polymer_PropertyEffects}
-     * @unrestricted
-     */
-    const base = Polymer.PropertyEffects(superClass);
-
-    /**
-     * @polymer
-     * @mixinClass
-     * @implements {Polymer_PropertyEffects}
-     * @extends {propertyEffectsBase}
-     * @unrestricted
-     */
-    class AttributeCapitalization extends base {
-      /**
-       * Overrides default `PropertyEffects` implementation to automatically
-       * detect capitalized attributes.
-       *
-       * @override
-       * @param {Node} node Node to parse
-       * @param {TemplateInfo} templateInfo Template metadata for current template
-       * @param {NodeInfo} nodeInfo Node metadata for current template node
-       * @return {boolean} `true` if the visited node added node-specific
-       *   metadata to `nodeInfo`
-       * @protected
-       * @suppress {missingProperties} Interfaces in closure do not inherit statics, but classes do
-       */
-      static _parseTemplateNodeAttribute(node, templateInfo, nodeInfo, name, value) {
-        if (regex.test(name)) {
-          node.removeAttribute(name);
-          name = name + '$';
-        }
-        return super._parseTemplateNodeAttribute(node, templateInfo, nodeInfo, name, value);
-      }
-    }
-
-    return AttributeCapitalization;
-  });
-})();
-</script>
diff --git a/test/unit/attribute-capitalization.html b/test/unit/attribute-capitalization.html
deleted file mode 100644
index f7927a822f..0000000000
--- a/test/unit/attribute-capitalization.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!doctype html>
-<!--
-@license
-Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-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
--->
-<html>
-<head>
-  <meta charset="utf-8">
-  <script src="../../../webcomponentsjs/webcomponents-lite.js"></script>
-  <script src="../../../web-component-tester/browser.js"></script>
-  <link rel="import" href="../../polymer.html">
-  <link rel="import" href="../../lib/utils/attribute-capitalization-mixin.html">
-</head>
-<body>
-
-  <dom-module id="svg-element">
-    <template>
-      <svg id="svg" viewBox="[[value]]"></svg>
-    </template>
-    <script>
-      class SVGElement extends Polymer.AttributeCapitalization(Polymer.Element) {
-        static get is() { return 'svg-element'; }
-        static get properties() {
-          return {
-            value: {
-              type: String,
-              value: '0 0 50 50'
-            }
-          };
-        }
-      }
-      customElements.define(SVGElement.is, SVGElement);
-    </script>
-  </dom-module>
-
-<script>
-suite('automated attribute capitalization detection', function() {
-  let el;
-
-  setup(function() {
-    el = document.createElement('svg-element');
-    document.body.appendChild(el);
-  });
-
-  teardown(function() {
-    document.body.removeChild(el);
-  });
-
-  test('can handle capitalized HTML attribute', function() {
-    assert.equal(el.$.svg.getAttribute('viewBox'), el.value);
-  });
-});
-</script>
diff --git a/test/unit/property-effects-elements.html b/test/unit/property-effects-elements.html
index aeeee70e43..ecfca10c0c 100644
--- a/test/unit/property-effects-elements.html
+++ b/test/unit/property-effects-elements.html
@@ -7,6 +7,8 @@
 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
 -->
+<link rel="import" href="../../polymer.html">
+
 <dom-module id="x-basic">
   <template>
     <div id="boundChild"
@@ -1062,3 +1064,23 @@
 }
 customElements.define(SubObserverElement.is, SubObserverElement);
 </script>
+
+<dom-module id="svg-element">
+  <template>
+    <svg id="svg" viewBox="[[value]]"></svg>
+  </template>
+  <script>
+    class SVGElement extends Polymer.Element {
+      static get is() { return 'svg-element'; }
+      static get properties() {
+        return {
+          value: {
+            type: String,
+            value: '0 0 50 50'
+          }
+        };
+      }
+    }
+    customElements.define(SVGElement.is, SVGElement);
+  </script>
+</dom-module>
diff --git a/test/unit/property-effects.html b/test/unit/property-effects.html
index 2a7581fbb5..efe4bf6b34 100644
--- a/test/unit/property-effects.html
+++ b/test/unit/property-effects.html
@@ -419,6 +419,23 @@
       assert.equal(el.__observerCalled, 1);
     });
   });
+
+  suite('automated attribute capitalization detection', function() {
+    let el;
+
+    setup(function() {
+      el = document.createElement('svg-element');
+      document.body.appendChild(el);
+    });
+
+    teardown(function() {
+      document.body.removeChild(el);
+    });
+
+    test('can handle capitalized HTML attribute', function() {
+      assert.equal(el.$.svg.getAttribute('viewBox'), el.value);
+    });
+  });
 });
 
 suite('computed bindings with dynamic functions', function() {
diff --git a/types/lib/utils/attribute-capitalization-mixin.d.ts b/types/lib/utils/attribute-capitalization-mixin.d.ts
deleted file mode 100644
index 0188ffeb3e..0000000000
--- a/types/lib/utils/attribute-capitalization-mixin.d.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * DO NOT EDIT
- *
- * This file was automatically generated by
- *   https://github.com/Polymer/gen-typescript-declarations
- *
- * To modify these typings, edit the source file(s):
- *   lib/utils/attribute-capitalization-mixin.html
- */
-
-/// <reference path="boot.d.ts" />
-/// <reference path="mixin.d.ts" />
-/// <reference path="../mixins/property-effects.d.ts" />
-
-declare namespace Polymer {
-
-
-  /**
-   * Mixin that uses an heuristic to determine the capitalization of HTML
-   * attributes. By default, all attributes are lowercased. However, some
-   * native attributes have capitalization. `Element.attributes` only returns
-   * capitalized attributes if the attribute name is exactly equal to the attribute.
-   * In other words, `viewBox$` will be lowercased to `viewbox$`. Therefore, if
-   * an attribute name still has capitaliation, we use an attribute effect to
-   * update the bindings.
-   */
-  function AttributeCapitalization<T extends new (...args: any[]) => {}>(base: T): T & AttributeCapitalizationConstructor & Polymer.PropertyEffectsConstructor & Polymer.TemplateStampConstructor & Polymer.PropertyAccessorsConstructor & Polymer.PropertiesChangedConstructor;
-
-  interface AttributeCapitalizationConstructor {
-    new(...args: any[]): AttributeCapitalization;
-
-    /**
-     * Overrides default `PropertyEffects` implementation to automatically
-     * detect capitalized attributes.
-     *
-     * @param node Node to parse
-     * @param templateInfo Template metadata for current template
-     * @param nodeInfo Node metadata for current template node
-     * @returns `true` if the visited node added node-specific
-     *   metadata to `nodeInfo`
-     */
-    _parseTemplateNodeAttribute(node: Node|null, templateInfo: TemplateInfo|null, nodeInfo: NodeInfo|null, name: any, value: any): boolean;
-  }
-
-  interface AttributeCapitalization {
-  }
-}