Revert "[FEATURE] Maximize the use of subdomains"

This reverts commit bd81f6118ce557546ef124407db4811c04959172.