I'm open to this change, but I don't think it should block the initial merge.