Revert "Prevent NPE on some CDMA devices"

This reverts commit c4f28d4a19f1159256ca432b857f14c52d3c3417.
Revert "fix for Samsung CDMA incoming SMS bug"

This reverts commit 55d645681e98d07939b0c0cda6cc854273aaf2bb.