Revert 4b7f53da7618 (simplify-merges: drop merge from irrelevant side branch, 2013...