Should this TODO be replaced with something?