[11u] Backport of 8274338 causes jtreg test failurs

[Severin Gehwolf]

On Wed, 2021-11-10 at 10:31 +0000, Lindenmaier, Goetz wrote:
> I think we should backout this change.

+1. We can re-integrate it at a later stage.

Thanks,
Severin