diff --git a/.editorconfig b/.editorconfig
index 42f5867c90..2c73f926bd 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -13,8 +13,8 @@ indent_style = space
 indent_size = 4
 end_of_line = lf
 charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
+trim_trailing_whitespace = false # These are the correct rules for APM coding standards, but fixing up old files causes git spam
+insert_final_newline = false
 
 [*.mk]
 indent_style = tab