Revert "Merge pull request #3643 from cammoraton/rhel7-plugin-fixes"

This reverts commit 919d0b9f4b77cd9f2d2bd050fc2db5f00eeebabd, reversing
changes made to 924c47feb39354cf6ddb008a23a425c404c61446.