Bring back hammerhead

This reverts commit 628c5189348ae580293a21c3610f1999ce3eb1ef.