Reverting components event handling