This reverts commit 226cfa82. This commit caused test failures on appveyor/windows. Work on fixing them is in #3235.