Re-add click handler. 

This seems to be the best compromise.