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

This reverts commit cd50fa78f8878dca87632b81c6059378d432e516.