revert back to CM's event handlers