Revert "New RIL API"

This reverts commit a29d5e7755a09435eb6dd3e30086289da1b517b3.