Remove commented-out code from previous change