This is safe now, we can remove the todo.