The solution is to manually coalesce future builds by folding patches from unrelated bugs together. The sheriffs are cool; they won’t mind.
