Vendor: Revert some changes, to fix RIL