Just don't delete the upstream queue, ever. That's easier to reason about.
Merged bug25707 into stable