Remove hack. Test crashes 50% of the time..