diff --git a/app/code/Magento/Config/etc/system_file.xsd b/app/code/Magento/Config/etc/system_file.xsd
index f1688b2e35371..9fac22eb5f074 100644
--- a/app/code/Magento/Config/etc/system_file.xsd
+++ b/app/code/Magento/Config/etc/system_file.xsd
@@ -178,7 +178,7 @@
             <xs:sequence>
                 <xs:choice minOccurs="0" maxOccurs="unbounded">
                     <xs:element name="label" type="xs:string" />
-                    <xs:element ref="comment" />
+                    <xs:element name="comment" type="commentType" minOccurs="0" />
                     <xs:element name="tooltip" type="xs:string" />
                     <xs:element name="hint" type="xs:string" />
                     <xs:element name="frontend_class" type="xs:string" />
@@ -479,20 +479,12 @@
         </xs:restriction>
     </xs:simpleType>
 
-    <xs:element name="comment">
-        <xs:annotation>
-            <xs:documentation>
-                Comment type
-            </xs:documentation>
-        </xs:annotation>
-
-        <xs:complexType mixed="true">
-            <xs:sequence>
-                <xs:any minOccurs="0" maxOccurs="1" processContents="lax" />
-            </xs:sequence>
-            <xs:attributeGroup ref="commentAttributeGroup"/>
-        </xs:complexType>
-    </xs:element>
+    <xs:complexType name="commentType" mixed="true">
+        <xs:sequence>
+            <xs:element name="model" type="typeModel" minOccurs="0"/>
+        </xs:sequence>
+        <xs:attribute name="model" type="xs:string" use="optional"/>
+    </xs:complexType>
 
     <xs:simpleType name="typeConfigPath">
         <xs:annotation>