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

This reverts commit 2782b3473b0626d2d2095f2260120bd7257b9744.