Follow-up r85278, r85240: