Revert "Fix potential deadlock and delayed notification"

This reverts commit 46498b6e382fce347850f329378275f10ae4be12.