FIXED: Reverted Windows-specific hack.