update to use Polymer.addEventListener/removeEventListener