Appendix to !1068 (merged) for very complex upgrades
This will create a new commit in order to revert the existing changes.
