diff --git a/tools/travis/backend b/tools/travis/backend
index 17d2217837..6cd0eeaca0 100755
--- a/tools/travis/backend
+++ b/tools/travis/backend
@@ -6,9 +6,7 @@ echo "Test suite is running under $(python --version)."
 set -e
 set -x
 
-#./tools/lint --backend ${CIRCLECI:+--no-gitlint}
-# TEMP: turn off git lint
-./tools/lint --backend --no-gitlint
+./tools/lint --backend --no-gitlint  # gitlint disabled because flaky
 ./tools/test-tools
 ./tools/test-backend --coverage
 
diff --git a/tools/travis/frontend b/tools/travis/frontend
index 8817db312f..5d0c2782d1 100755
--- a/tools/travis/frontend
+++ b/tools/travis/frontend
@@ -5,9 +5,7 @@ source tools/travis/activate-venv
 set -e
 set -x
 
-# ./tools/lint --frontend
-# TEMP: turn off git lint
-./tools/lint --frontend --no-gitlint
+./tools/lint --frontend --no-gitlint  # gitlint disabled because flaky
 
 # Run the node tests first, since they're fast and deterministic
 ./tools/test-js-with-node --coverage