Revert "Merge branch 'bug_3857' into 'master'"

This reverts merge request !838 (merged) Causing build failure across platforms due to undefined reference to `pthread_sigmask'