Reverting change as this broke on Linux