Revert "CDMA: Data connection bug fixes (4/4)"

This reverts commit 9d397325b8783a1e68b887f94443ef8f2665fb11.