This reverts commit 15694fd6. Need to investigate and fix a failing clang test: synchronized.m. Might need a test update.