I fear this is from my contribution, but this commented-out code should be removed...