Resolve doesn't support a timeout anymore, which is unfortunate