Yes, He did promise...but not in that order. He is clear on what has to happen.
Here's one of the first, if not the first, times the promise is made:
Deuteronomy 30:1-5
And it shall come to pass, when all these things are come upon thee, the blessing and the curse, which I have set before...