Revert previous tentative fix for mono, it didn't work