Revert "Re-commit changes in r237579 with fix for bug breaking windows builds."