CLC-1220 Automating downgrades as well as upgrades

QA branch version of the same fix from #646.