It causes a failure on Windows right now. This reverts commit 045b2803. (cherry picked from commit 15b1eb7c)