Revert "Super bizarre but efficient workaround for toro RIL (2/3)"

This reverts commit cb715b936f6eeb5ec59f2c1e97cadb094a70acd2. No longer needed with other data fixes in place.