Nit: Should this be a TODO?