Maybe now would be a good time to remove this commented-out code.