Fix forward port

This is the rest of the forward port after ignoring Martin's request. After this 72X and 73X should be in sync.

@davidlange6 also this should be trivial. I think this new way of producing forward ports is much cleaner, the trick is to do a pull request for an already merged branch, not for the branch you want to merge.