Reverting changes because they break windows build.

This reverts commit a8ffbd10776df479f71c213e5f1deb5f9e866307.