[PATCH 05/11] Vastly simplify the process for applying changes from custom spoke.