Comment by dmitshur

Hopefully this is mostly intended to rewrite/polish local history, before it’s pushed upstream.