Revert r5723. I think I'll do these RHEL6 changes in a branch.
Revert r5723. I think I'll do these RHEL6 changes in a branch.

NREL/api-umbrella-router,apinf/api-umbrella,NREL/api-umbrella-router,OdiloOrg/api-umbrella-router,NREL/api-umbrella,OdiloOrg/api-umbrella-router,NREL/api-umbrella-router,OdiloOrg/api-umbrella-router,NREL/api-umbrella,NREL/api-umbrella,apinf/api-umbrella,apinf/api-umbrella,apinf/api-umbrella,apinf/api-umbrella,NREL/api-umbrella