Merge "Remove fossilized upgrade code." into tm-dev