Revert "Try fixing RIL, and make more buildable..."

This reverts commit f0291c02e9738240d6f919804da1186b2f818542.
Revert "BR#7 preps:"

This reverts commit 4a76c256399d8beb2d1e87d1e97dc26511380932.