This reverts commit 1a761e5b7b. Failed CI, albeit with a different failure mode to BZ51982
1a761e5b7b