Partially revert e09aba36765887fef1b7da72648e3ee2314256dc. Fix #696: Distributed problem