Bring back hammerhead

This reverts commit 936744a1a477ded736c5e9bc05d1f21cabba56c6.