This TODO no longer applies