Small fixes for when clustering is not possible
Revert "Remove sharing for now."

This reverts commit d7201cca5180b0a4d1d02f86512364499471e88c.