backing up accidental merge of followtrace