This reverts commit 90210c4862. (cherry picked from commit be414e4476)
90210c4862
be414e4476
This was enabled by default on some systems (e.g. Windows).