A recent commit has been made that caused patches to be out of order, rebuilding
Co-authored by: chickeneer <emcchickeneer@gmail.com>