It looks like this commented-out chunk can go away.