Backed out [ALLI-1891] due to URL's not working properly, part 2.