Task #11822: Revert back to old version, so we can shut off the distance test