Port the changes to centos6