This partially reverts commit f45798e5. cc @ivan I'd like to have that left in, because it's very useful for gcc compiles, when necessary patches often span multiple releases, i.e. for aarch64 builds
