revert mutex "optimization" that turned out to be worse