There were several places like this, all of which were refactored to be functionally equivalent, whenever old code would fail, new code should fail too. I figured that fixing non-trivial duplicate columns issues is better done in separate PRs, this one is already huge.