Do we want to change this behavior here? I vote for minimizing the use of TODOs. Maybe we can fix the comment?