This reverts commit ecd1d020. That commit caused test failures on my Debian Linux machine for all changed test cases. We need to reconsider how that should get done.