adaptation for hammerhead

The one above has been merged, thanks @stskeeps , now we'll need to update from upstream on https://github.com/mer-hybris/libhybris