Back out earlier fix.

This seems to have broken RHEL5.  I backed it out and verified that it works with RHEL5 and RHEL6.