Merge "Revert "Remove lousy synchronization"" into qt-dev