This reverts commit 5a291f0c914c904c98dcd3d1f0434f05bf31f39e. This workaround is not needed anymore after commit 161a0e9521bc3ef30c799234d3f82d84b971afdd
This reverts commit 5a291f0c914c904c98dcd3d1f0434f05bf31f39e. This workaround is not needed anymore after commit 161a0e9521bc3ef30c799234d3f82d84b971afdd