Catchup with upstream

This makes us identical to upstream (via different history path, so as not to lose the previous work done). We can deprecate this now!