diff --git a/src/config.js b/src/config.js
index 249542366..58b25ad30 100644
--- a/src/config.js
+++ b/src/config.js
@@ -40,7 +40,6 @@ exports = module.exports = {
 
     // feature flags based on editions (these have a separate license from standard edition)
     isSpacesEnabled: isSpacesEnabled,
-    allowHyphenatedSubdomains: allowHyphenatedSubdomains,
 
     // for testing resets to defaults
     _reset: _reset
@@ -221,11 +220,6 @@ function isSpacesEnabled() {
     return get('edition') === 'education';
 }
 
-function allowHyphenatedSubdomains() {
-    // we should move caas also to hostingprovider edition at some point
-    return get('edition') === 'hostingprovider' || get('provider') === 'caas';
-}
-
 function provider() {
     return get('provider');
 }
diff --git a/src/domains.js b/src/domains.js
index f8f5a24ef..4d1048c93 100644
--- a/src/domains.js
+++ b/src/domains.js
@@ -208,8 +208,6 @@ function add(domain, zoneName, provider, dnsConfig, fallbackCertificate, tlsConf
         zoneName = tld.getDomain(domain) || domain;
     }
 
-    if (dnsConfig.hyphenatedSubdomains && !config.allowHyphenatedSubdomains()) return callback(new DomainsError(DomainsError.BAD_FIELD, 'Not allowed in this edition'));
-
     if (fallbackCertificate) {
         let subdomain = dnsConfig.hyphenatedSubdomains ? `test-${domain}` : `test.${domain}`;
         let error = reverseProxy.validateCertificate(subdomain, fallbackCertificate.cert, fallbackCertificate.key);
@@ -300,8 +298,6 @@ function update(domain, zoneName, provider, dnsConfig, fallbackCertificate, tlsC
             zoneName = result.zoneName;
         }
 
-        if (dnsConfig.hyphenatedSubdomains && !config.allowHyphenatedSubdomains()) return callback(new DomainsError(DomainsError.BAD_FIELD, 'Not allowed in this edition'));
-
         if (fallbackCertificate) {
             let subdomain = dnsConfig.hyphenatedSubdomains ? `test-${domain}` : `test.${domain}`;
             let error = reverseProxy.validateCertificate(subdomain, fallbackCertificate.cert, fallbackCertificate.key);