Is this TODO something we want to resolve before PR is merged?