Revert "A dubious hack to work around a ccross bug that prevents mutexes from being used in a lot of places."

This reverts commit 9e18283f81695b4f75c0743813cb65da9d338287.