Use the more aggressive resolution when doing early resolution too. Might fix #6967.