Simplify Thread Voting Scheme #2129