Revert "core and telephony: Additional HSPAP support"

This reverts commit 8cda387fabf6a437a4aada1e7c62e6bc63e9227f.