Merge "Revert upgrades"