Revert incorrect implementation of model events