The corresponding notification handling code has been rewritten since so let's not assume it is still fragile. This reverts commit 0c882970.