This addresses the bug in ATR-24142, as an urgent, temporary measure while it is solved locally. Tagging @dzanzi .