Once the fix for [JENKINS-74047](https://issues.jenkins.io/browse/JENKINS-74047) is merged, released, and adopted, the workaround added in #1749 should be deleted.