Revert "FW: Fix Notification Shortcuts"

This reverts commit 885607b3d1b3177d7577141af7494824d5a6f8ef.