more regression undoing for thread issues.