Revert ril: adapt for an upstream update