Is this TODO no longer accurate?