This reverts commit 97fda644 due to breaking the AArch64 pre-commit, the VPS build, and changing how options that have changed are computed.
This reverts commit 97fda644 due to breaking the AArch64 pre-commit, the VPS build, and changing how options that have changed are computed.