Fix broken temporary backcompat shim for naughty _resolve_condition callers

The 9b96f3d41 refactor undid all the backcompat shims that were introduced
in c0f445097. Reinstate the insanity until after 28...