Some changes reverted for build on Windows and Mac