Try avoiding a dist-upgrade.