I don't prefer to change this unless there is a bug here. because we might need to diff it with upstream in future. avoid conflicts.