Revert "[FEATURE] Maximize the use of subdomains"

This reverts commit 1d5611878b12f95eb3fb354e39780f569c3ee3f1.