Reapply r183985 now that the missing check was added to PathV2.