Revert "Fix #526. New nodes should add old shards without panicing"

This reverts commit ac98817a55d88b8046804a802273134c1f03887b.
Fix #536. New nodes should add old shards without panicing