Yes, that looks like to be the idea, to keep an option for a man in the middle attack.