try removing basically dead code in resolve
FIXMES (shouldn't appear in upstream)