Multiple locations without activation stuff

Clobbered branches earlier when trying to find the best way to merge to master. This is the same as #845