Revert "Proper supplementary service notification handling (3/5)"

This reverts commit 1c34e0a320efece078e65674ba3c93fb023841ca.