Remove hack since it didn't work...