diff --git a/.clang-format.base b/.clang-format
similarity index 98%
rename from .clang-format.base
rename to .clang-format
index a1e26efb78..23958ffc7f 100644
--- a/.clang-format.base
+++ b/.clang-format
@@ -34,7 +34,6 @@ BraceWrapping:
   AfterClass: true
   BeforeCatch: true
   BeforeElse: true
-  BeforeLambdaBody: true
   SplitEmptyRecord: true
   SplitEmptyNamespace: true
 SortIncludes: true
diff --git a/.gitignore b/.gitignore
index edd1b4e0eb..032d0349ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -82,6 +82,3 @@ Testing
 
 # Autogenerated Build Prep artifacts
 util/build_prep/*/prep.sh
-
-# Autogenerated Tooling
-.clang-format
diff --git a/ci/check-commit-format.sh b/ci/check-commit-format.sh
index c253d882c2..8a1c1e44a8 100755
--- a/ci/check-commit-format.sh
+++ b/ci/check-commit-format.sh
@@ -13,6 +13,7 @@ source "$(dirname "$BASH_SOURCE")/common.sh"
 
 if [[ ! -z $(git status --untracked-files=no --porcelain) ]]; then
     echo "Code formatting differs from expected - please run ci/clang-format-all.sh"
+    git diff
     git reset --hard HEAD > /dev/null
     exit 1
 fi
diff --git a/ci/clang-format-all.sh b/ci/clang-format-all.sh
index b0bacf0512..c24018337c 100755
--- a/ci/clang-format-all.sh
+++ b/ci/clang-format-all.sh
@@ -5,6 +5,4 @@ set -e
 source "$(dirname "$BASH_SOURCE")/detect-clang-format.sh"
 source "$(dirname "$BASH_SOURCE")/common.sh"
 
-"$REPO_ROOT/ci/update-clang-format"
-
-find "$REPO_ROOT/nano" -iname '*.h' -o -iname '*.hpp' -o -iname '*.cpp' | xargs "$CLANG_FORMAT" -i
+find "$REPO_ROOT/nano" -iname '*.h' -o -iname '*.hpp' -o -iname '*.cpp' | xargs "$CLANG_FORMAT" -i -style=file
diff --git a/ci/update-clang-format b/ci/update-clang-format
deleted file mode 100755
index 56bc73a87b..0000000000
--- a/ci/update-clang-format
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-source "$(dirname "$BASH_SOURCE")/common.sh"
-
-cd "$REPO_ROOT"
-
-retval='1'
-
-rm -f .clang-format
-cp .clang-format.base .clang-format
-for try in {1..10}; do
-	errors="$(clang-format -dump-config 2>&1 >/dev/null)" || :
-	if [ -z "${errors}" ]; then
-		retval='0'
-
-		break
-	fi
-
-	errors_line="$(echo "${errors}" | awk '
-		/^YAML:/{
-			sub(/^YAML:/, "");
-			sub(/:.*/, "");
-			print;
-			exit;
-		}
-	')"
-
-	if ! [ "${errors_line}" -gt -1 ] 2>/dev/null; then
-		break
-	fi
-
-	rm -f .clang-format.new
-	sed "${errors_line} d" .clang-format >.clang-format.new
-	mv .clang-format.new .clang-format
-done
-
-exit "${retval}"