Should fix T46616 but will reintroduce T46284.
The second, original bug needs different handling
This reverts commit 904db487a7.
Should fix T46616 but will reintroduce T46284.
The second, original bug needs different handling
This reverts commit 904db487a7.