Trying to unwind the messy mess and make 9.2.1.8->9.3.0 upgrades work