Revert "Merge branch 'krechert-master-patch-56362' into 'master'"

This reverts merge request !1
1 job for revert-e8563d9f in 3 minutes and 8 seconds (queued for 1 second)
latest
Status Name Job ID Coverage
  Test
passed build #623373562

00:03:08