diff --git a/.gitlint b/.gitlint
index 6c320ed335..a61eb093ac 100644
--- a/.gitlint
+++ b/.gitlint
@@ -1,7 +1,7 @@
 [general]
 ignore=title-trailing-punctuation, body-min-length, body-is-missing
 
-extra-path=tools/lib/gitlint-rules.py
+# extra-path=tools/lib/gitlint-rules.py
 
 [title-match-regex]
 regex=^.+\.$
diff --git a/tools/lint b/tools/lint
index 4b7b062e87..b909328191 100755
--- a/tools/lint
+++ b/tools/lint
@@ -167,9 +167,9 @@ def run():
     external_linter('urls', ['tools/check-urls'], ['py'])
     external_linter('swagger', ['node', 'tools/check-swagger'], ['yaml'])
 
-    # gitlint disabled until we can stabilize it more
-    # if not args.no_gitlint:
-    #     external_linter('commit_messages', ['tools/commit-message-lint'])
+    # Disabled check for imperative mood until it is stabilized
+    if not args.no_gitlint:
+        external_linter('commit_messages', ['tools/commit-message-lint'])
 
     @lint
     def custom_py():