Board Thread:Spoilers!/@comment-31937823-20180405010135/@comment-34376046-20180510192217

See I would be inclined to agree with you I feel like they wrapped it up in Season 3 nicely but then this:

Will the season 3 prophecy about the boy being Rumple’s undoing come back into play? HOROWITZ: That’s a very interesting question. KITSIS: Let’s go with yes!

Just reads as though they have planned something and I would not put it past them to bring it back. Either that or as always they are trying to get people to guess.