Reverted commit 5419 as it prevented notifications from appear