Revert "Proper supplementary service notification handling (4/5)."

This reverts commit 9eada9d9b286c791833771fd631a4a491cf46bad.