Updated to work with latest Polymer.