Undo-ing my changes to comment threading