Remove hack because it breaks windows