!UPSTREAM: Stop doing pre-emptive resolves