Revert "Temporary fix to work around
#1057."...
Revert "Temporary fix to work around
#1057."
This reverts commit 65546bf8a85a3fdf359d0784204360e9ecdc95ec, done to
temporaly fixed a race condition introduced by
#956, next commits should
fixe this race condition