This reverts commit ab40c027. Some additional test cases are influenced by the workaround, and I need to do a complete test run to identify and check them all.