Clean up the special accomodations for toro's RIL so that they work with 4.4.1