Revert last change - result in duplicate events