Revert "seems to work fine with simple merges"

This reverts commit 722e0977c7eb5f048e09d9d4d6d34adec2279d13.