Revert "2/2 fix data"

This reverts commit 39183d2f1654f2ce0cb3b382641d9277db5454f8.
Revert "changes for RIL"

This reverts commit b337142f416e69436e66039684f33b64eb4d031c.