Revert "Last try on RIL today"

This reverts commit 0543e0cbb702f9669a45b1e2de6990543789d823.
Revert "EXPERIMENTAL: Second try on fixing RIL"

This reverts commit c0cdec67ca14a5e8a0e1edab77519138ced17681.