Revert "more tweaks to ShardInfo fix"

This reverts commit bdf8f0d90b1f68f5b423d1bf95f3523ebff73a87.