Board Thread:Spoilers!/@comment-30161539-20180226194925/@comment-25926288-20180226203111

Yes, it was fulfilled in 3A as Henry led Rumple to Pan after which he sacrificed himself.

Plus, the writers said that it was a done deal (though fans still think this is in play for some reason) years ago.