Revert "SPIGOT-7447: Fix --forceUpgrade"This reverts commit 70e0bc050a2ef1bb5b0d8ac97be24484f3891ceb.