diff --git a/post_merge.sh b/post_merge.sh
index 32905f18b1..4677f6f80f 100755
--- a/post_merge.sh
+++ b/post_merge.sh
@@ -40,10 +40,11 @@ restore_sc .github
 git add -A
 git commit -m "Automatic upstream merge postprocessing"
 
+revert_last 'Automatic revert to unchanged upstream strings, pt.1' || \
+    read -p "Please resolve conflicts and commit, then press enter"
 
 "$mydir"/correct_strings.sh
 
-revert_last 'Revert "Resolve required manual intervention in german strings"'
 
 while grep -q "wolpertinger\|schlumpfwesen" "$mydir/vector/src/main/res/values-de/strings.xml"; do
     read -p "Please resolve remaining language, then press enter!"
diff --git a/pre_merge.sh b/pre_merge.sh
index 60ed489236..e44a12fdf9 100755
--- a/pre_merge.sh
+++ b/pre_merge.sh
@@ -20,8 +20,9 @@ restore_upstream() {
     fi
 }
 
-revert_last 'Resolve required manual intervention in german strings'
-revert_last 'Automatic SchildiChat string correction'
+# Revert Schildi's upstream string changes
+git checkout `upstream_previous_tag` -- `find "$mydir/vector/src/main/res" -name strings.xml`
+git commit -m "Automatic revert to unchanged upstream strings, pt.1"
 
 # Keep in sync with post_merge.sh!
 restore_upstream .github