Bring back hammerhead

This reverts commit a17f55cd1e7110ced21ca498c15fb84a859ce919.