Merge "Don't tie ephemeral resolver/installer"