Re-rolled patch, attached interdiff for same.