Remove hack for 6.0-4 bug