Revert "EXPERIMENTAL: First try on fixing RIL"

This reverts commit 005c7a00aab1ff79981bb97c86ce641354981430.