diff --git a/build-aux/git-hooks/commit-msg b/build-aux/git-hooks/commit-msg
index a8ae70d49d3..a52862bf745 100755
--- a/build-aux/git-hooks/commit-msg
+++ b/build-aux/git-hooks/commit-msg
@@ -92,6 +92,11 @@ exec $awk \
     status = 1
   }
 
+  /(^|[^\\])`[^'\''`]+`/ {
+    print "Markdown-style quotes in commit message"
+    status = 1
+  }
+
   nlines == 0 && $0 !~ non_space { next }
 
   { nlines++ }
diff --git a/build-aux/git-hooks/prepare-commit-msg b/build-aux/git-hooks/prepare-commit-msg
index 7761f46e5e0..e8243e157cd 100755
--- a/build-aux/git-hooks/prepare-commit-msg
+++ b/build-aux/git-hooks/prepare-commit-msg
@@ -40,10 +40,6 @@ exec $awk "
     print \"'Signed-off-by:' in commit message\"
     status = 1
   }
-  /(^|[^\\\\])\`[^'\`]+\`/ {
-    print \"Markdown-style quotes in commit message\"
-    status = 1
-  }
   END {
     if (status != 0) {
       print \"Commit aborted; please see the file 'CONTRIBUTE'\"