Pull a hammerhead out of a muppet

Change-Id: I24c513c4dd5ccc1ac177ad44d62ba8c04e0f8e3b