Reverted 22f3b9a for BlockDist ONLY.