[LIR] Re-instate r244880, reverted in r244884, factoring the handling of