For multi site setups, first look for a container under the root
Revert "For multi site setups, first look for a container under the root"

This reverts commit 10cbaac9fcacfec86a6a4bf4adc9c1da4a38fd5f.