Address https://github.com/Polymer/polymer/issues/491