Bringing back the change from 80a4178af9b12e6617bfcec818c538dfe08d3791, adapted to...