Always include the location, unless for setup. Partially undoes e4bb7a76...

We need this, and we need it to be mandatory, for an efficient, correct implementation of the "not enough short links on opennet" fix.