diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
index b2e946a597..1b1404a897 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
@@ -288,7 +288,7 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
                 return new OptionalInnerTextConfigurationElement<bool>(
                     (InnerTextConfigurationElement<bool>) this["EnableInheritedDocumentTypes"],
                     //set the default
-                    false);
+                    true);
             }
         }
         
diff --git a/src/Umbraco.Core/Models/ContentType.cs b/src/Umbraco.Core/Models/ContentType.cs
index 7219230bc2..355d724fbe 100644
--- a/src/Umbraco.Core/Models/ContentType.cs
+++ b/src/Umbraco.Core/Models/ContentType.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.Serialization;
-using Umbraco.Core.Configuration;
 
 namespace Umbraco.Core.Models
 {
@@ -35,10 +34,6 @@ namespace Umbraco.Core.Models
         [Obsolete("This method is obsolete, use ContentType(IContentType parent, string alias) instead.", false)]
         public ContentType(IContentType parent) : this(parent, null)
         {
-            if (UmbracoConfig.For.UmbracoSettings().Content.EnableInheritedDocumentTypes)
-            {
-                AddContentType(parent);
-            }
         }
 
         /// <summary>
@@ -50,10 +45,6 @@ namespace Umbraco.Core.Models
         public ContentType(IContentType parent, string alias)
             : base(parent, alias)
         {
-            if (UmbracoConfig.For.UmbracoSettings().Content.EnableInheritedDocumentTypes)
-            {
-                AddContentType(parent);
-            }
             _allowedTemplates = new List<ITemplate>();
         }
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js
index dda6bc38b3..4b1ed8f9c1 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js
@@ -7,13 +7,13 @@ function contentTypeResource($q, $http, umbRequestHelper, umbDataFormatter) {
 
     return {
 
-        getAvailableCompositeContentTypes: function (contentTypeId, parentId) {
+        getAvailableCompositeContentTypes: function (contentTypeId) {
             return umbRequestHelper.resourcePromise(
                $http.get(
                    umbRequestHelper.getApiUrl(
                        "contentTypeApiBaseUrl",
                        "GetAvailableCompositeContentTypes",
-                       [{ contentTypeId: contentTypeId }, { parentId: parentId }])),
+                       [{ contentTypeId: contentTypeId }])),
                'Failed to retrieve data for content type id ' + contentTypeId);
         },
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
index 10ead115f2..0700e08c2e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
@@ -213,7 +213,7 @@
 
         function init(contentType) {
             //get available composite types
-            contentTypeResource.getAvailableCompositeContentTypes(contentType.id, contentType.parentId).then(function (result) {
+            contentTypeResource.getAvailableCompositeContentTypes(contentType.id).then(function (result) {
                 contentType.availableCompositeContentTypes = result;
                 // convert icons for composite content types
                 iconHelper.formatContentTypeIcons(contentType.availableCompositeContentTypes);
diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.config b/src/Umbraco.Web.UI/config/umbracoSettings.config
index f20579e698..77d31fda09 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.config
@@ -104,7 +104,7 @@
     <defaultDocumentTypeProperty>Textstring</defaultDocumentTypeProperty>
     
     <!-- Enable inherited document types. This feature will be deprecated in v8 -->
-    <EnableInheritedDocumentTypes>false</EnableInheritedDocumentTypes>
+    <EnableInheritedDocumentTypes>true</EnableInheritedDocumentTypes>
   </content>
 
   <security>
diff --git a/src/Umbraco.Web/Editors/ContentTypeController.cs b/src/Umbraco.Web/Editors/ContentTypeController.cs
index cd9caec397..72a605b6cc 100644
--- a/src/Umbraco.Web/Editors/ContentTypeController.cs
+++ b/src/Umbraco.Web/Editors/ContentTypeController.cs
@@ -93,9 +93,9 @@ namespace Umbraco.Web.Editors
             return ApplicationContext.Services.ContentTypeService.GetAllPropertyTypeAliases();
         }
 
-        public IEnumerable<EntityBasic> GetAvailableCompositeContentTypes(int contentTypeId, int parentId)
+        public IEnumerable<EntityBasic> GetAvailableCompositeContentTypes(int contentTypeId)
         {
-            return PerformGetAvailableCompositeContentTypes(contentTypeId, parentId, UmbracoObjectTypes.DocumentType);
+            return PerformGetAvailableCompositeContentTypes(contentTypeId, UmbracoObjectTypes.DocumentType);
         }
 
         [UmbracoTreeAuthorize(
diff --git a/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs b/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs
index 8e6ba92994..7962a73480 100644
--- a/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs
+++ b/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs
@@ -51,7 +51,7 @@ namespace Umbraco.Web.Editors
         /// Returns the available composite content types for a given content type
         /// </summary>
         /// <returns></returns>
-        protected IEnumerable<EntityBasic> PerformGetAvailableCompositeContentTypes(int contentTypeId, int parentId, UmbracoObjectTypes type)
+        protected IEnumerable<EntityBasic> PerformGetAvailableCompositeContentTypes(int contentTypeId, UmbracoObjectTypes type)
         {
             IContentTypeComposition source = null;
 
diff --git a/src/Umbraco.Web/Editors/MediaTypeController.cs b/src/Umbraco.Web/Editors/MediaTypeController.cs
index 3f2bde1dc9..d54981ff45 100644
--- a/src/Umbraco.Web/Editors/MediaTypeController.cs
+++ b/src/Umbraco.Web/Editors/MediaTypeController.cs
@@ -83,9 +83,9 @@ namespace Umbraco.Web.Editors
             return Request.CreateResponse(HttpStatusCode.OK);
         }
 
-        public IEnumerable<EntityBasic> GetAvailableCompositeMediaTypes(int contentTypeId, int parentId)
+        public IEnumerable<EntityBasic> GetAvailableCompositeMediaTypes(int contentTypeId)
         {
-            return PerformGetAvailableCompositeContentTypes(contentTypeId, parentId, UmbracoObjectTypes.MediaType);
+            return PerformGetAvailableCompositeContentTypes(contentTypeId, UmbracoObjectTypes.MediaType);
         }
 
         public ContentTypeCompositionDisplay GetEmpty(int parentId)
diff --git a/src/Umbraco.Web/Editors/MemberTypeController.cs b/src/Umbraco.Web/Editors/MemberTypeController.cs
index 72312669b2..7716f6ea00 100644
--- a/src/Umbraco.Web/Editors/MemberTypeController.cs
+++ b/src/Umbraco.Web/Editors/MemberTypeController.cs
@@ -79,9 +79,9 @@ namespace Umbraco.Web.Editors
             return Request.CreateResponse(HttpStatusCode.OK);
         }
 
-        public IEnumerable<EntityBasic> GetAvailableCompositeMemberTypes(int contentTypeId, int parentId)
+        public IEnumerable<EntityBasic> GetAvailableCompositeMemberTypes(int contentTypeId)
         {
-            return PerformGetAvailableCompositeContentTypes(contentTypeId, parentId, UmbracoObjectTypes.MemberType);
+            return PerformGetAvailableCompositeContentTypes(contentTypeId, UmbracoObjectTypes.MemberType);
         }
 
         public ContentTypeCompositionDisplay GetEmpty()