Add patch for hammerhead and remove unnecessary patch.