Revelation in Heaven

A two-parter story, in which the Doctor is initially tricked into coming to a kind of hi-tech mortuary where the dead are secretly being converted into a race of cybernetic warriors, his old enemies. The mortuary is run by one of his arch-enemies who has lured the Doctor there just to embarrass and humiliate him. Fortunately, the Doctor's mere presence inspires other people to sort out the villain for him.

Is it "Revelation of the Daleks" or "Dark Water/Death in Heaven"?