Fixed a bug caused by some commented-out code left over from much earlier.