Revert "also update cim_reg_eventadmin on merge"

This reverts commit 6f0c393618e488a9ed797206c60ea977136c8a2a.