Revert "ALGEBRA: See if can fix windows build"

This reverts commit 7f50e4b.
The fix was causing more problems than what it fixed...

Author: gsjaardema