Revert "Merge pull request #16992 from etiennesegonzac/bug-980984-incoming-alert-from-system"

This reverts commit 88677ea30dff41d6dc404ab95285d318accdd738, reversing
changes made to 6826cb8e2589651fbe3ec15b4fa9cb9a372de4cf.