diff --git a/ansible/roles/base/files/git_fix_author.bash b/ansible/roles/base/files/git_fix_author.bash
new file mode 100644
index 0000000..fc22b19
--- /dev/null
+++ b/ansible/roles/base/files/git_fix_author.bash
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+#
+set -euo pipefail
+IFS=$'\n\t'
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+git filter-branch --env-filter '
+WRONG_EMAIL="old@email.foo"
+NEW_NAME="New Name"
+NEW_EMAIL="new@email.buzz"
+
+if [ "$GIT_COMMITTER_EMAIL" = "$WRONG_EMAIL" ]
+then
+    export GIT_COMMITTER_NAME="$NEW_NAME"
+    export GIT_COMMITTER_EMAIL="$NEW_EMAIL"
+fi
+if [ "$GIT_AUTHOR_EMAIL" = "$WRONG_EMAIL" ]
+then
+    export GIT_AUTHOR_NAME="$NEW_NAME"
+    export GIT_AUTHOR_EMAIL="$NEW_EMAIL"
+fi
+' --tag-name-filter cat --commit-filter 'git commit-tree -S "$@";' -- --branches --tags
diff --git a/ansible/roles/base/tasks/common.yaml b/ansible/roles/base/tasks/common.yaml
index 6d0d709..4d2dcf8 100644
--- a/ansible/roles/base/tasks/common.yaml
+++ b/ansible/roles/base/tasks/common.yaml
@@ -47,6 +47,8 @@
       dest: /usr/local/bin/git_find_merged_branches
     - src: cleanup_temporary_files
       dest: /usr/local/bin/cleanup_temporary_files
+    - src: git_fix_author.bash
+      dest: /usr/local/bin/git_fix_author
 
 - import_tasks: tasks/freebsd.yaml
   when: 'os_flavor == "freebsd"'
diff --git a/ansible/roles/public_dns/files/master.db b/ansible/roles/public_dns/files/master.db
index 7f017ce..91b3841 100644
--- a/ansible/roles/public_dns/files/master.db
+++ b/ansible/roles/public_dns/files/master.db
@@ -46,8 +46,8 @@ fm1._domainkey      IN      CNAME   fm1.fizz.buzz.dkim.fmhosted.com.
 fm2._domainkey      IN      CNAME   fm2.fizz.buzz.dkim.fmhosted.com.
 fm3._domainkey      IN      CNAME   fm3.fizz.buzz.dkim.fmhosted.com.
 
-www     IN A     127.0.0.1
-        IN AAAA  ::1
+;www     IN A     127.0.0.1
+;        IN AAAA  ::1
 
 ; Allows email clients to automatically find the correct settings for your account.