Yes, that's the second tune for the verses. I don't do the octave leap version(though I could!) simply because I learned it the other way.

(Incidentally, another song that is rarely sung with its 2 parts of tune is Burns' song "Green Grow the Rashes" - Rod Paterson does both parts, but not many others do. Again it's a more challenging range to do both parts!)