build: attempt 2 at automating error recovery for cherry-picks