Was this comment meant as a TODO?