Remove hack that is no longer needed.