Remove that TODO if this function should return null.