Remove hack that didn't work :(