Revert "Merge pull request #320 from sonatype/hc4-432"

This reverts commit 74e0ecea8917df5c71f8b63e51ea745f333b4c65, reversing
changes made to 1855357e1f6fc5a3986b431fe4a5d526bca24e83.