Revert "FW: Fix Notification Shortcuts"

This reverts commit e406342073b0963708a0289a161c7d96b3f348db.