Pulled with_lock_guard patch.