this is originally what I thought #1333 was, but wasn't, but this is still valid fix
A recent commit has been made that caused patches to be out of order, rebuilding