Remove hack for supporting python 2.5 #6572