[fixes #64457618] Support ad hoc re-requests

Yes, its a horrid hack. But its a horrid hack to support a horrid hack.