Fix to 31f05a1: restore event handler code based on builtin v. registry