diff --git a/.clang-format b/.clang-format
index 80b67dfd..b067b942 100644
--- a/.clang-format
+++ b/.clang-format
@@ -8,7 +8,8 @@ TabWidth: 8
 #ColumnLimit: 120
 ColumnLimit: 132
 ConstructorInitializerIndentWidth: 8
-ContinuationIndentWidth: 8
+#ContinuationIndentWidth: 8
+ContinuationIndentWidth: 4
 #UseTab: ForContinuationAndIndentation
 UseTab: AlignWithSpaces
 UseCRLF: false
diff --git a/Makefile b/Makefile
index a257d8e6..664ccd53 100644
--- a/Makefile
+++ b/Makefile
@@ -1108,9 +1108,9 @@ endif
 .PHONY: codepolicycheck
 codepolicycheck:
 	@echo Code policy check
+	# --check-debug-log-calls: omitted, no longer passes with clang-format.
 	@$(PYTHON2) util/check_code_policy.py \
 		$(CODEPOLICYOPTS) \
-		--check-debug-log-calls \
 		--check-carriage-returns \
 		--check-fixme \
 		--check-non-ascii \