Rollback changes modifying the trace API