Fixes #6013, #6014 - changes for RHEL7

It didn't load at all, IIRC.