This reverts commit 8d31383dfe. Reason for revert: It is breaking TheRock build on Windows
8d31383dfe