We should either make the comment clear or remove it if it no longer applies.