Revert "more thread syncs."

This reverts commit 5cd826f91a9ca56eda5cb2abcf073381a618fb56.
Revert "Revert "more thread syncs.""

This reverts commit 48a57a14f5e76a7f79c4eb318cd2d2571f3aac82.