Multiple locations without activation stuff

Same as #860.