Drop old instanclick handler.
Merge master.