Fall out of the std::sync rewrite