Merge "Revert "Improve the thread flip.""