Might as well drop this entire block. There is a task for getting these events working properly.