Revert "Notification cancellation fixes:"

This reverts commit be0fea1645326df7c05bb2c8eb927981357f2137.