Trying harder to fix RHEL6 builds.