Board Thread:General Discussion/@comment-25823557-20150518111805/@comment-24674051-20150518180657

Rumple died in 3A as a result of sacrificing himself to save Henry.

Also, when Henry rewrote the ending to the Alternate Reality, that effectively undid Rumple in multiple ways, not the least of which is the removal of the Dark One curse.

So I would say that the prophecy is now completely fulfilled.