Revert "Fix potential deadlock and delayed notification"

This reverts commit f96599e7b264610ac295f42b9ac7825c1525ff2d.