Revert "ril: adapt for an upstream update"

This reverts commit fd77eef5161eefa65afb7effc1ef1787639dde95.