Bring back hammerhead

This reverts commit 628c5189348ae580293a21c3610f1999ce3eb1ef.
Merge remote-tracking branch 'upstream/kk-ras-mr1' into kk-ras-mr1
switch to stock rastakat