Remove workarounds needed for CentOS 5