For now, leave it. After the merge we can enhance if need be.