Does Apocalypse need a buff?

I was very excited to see a classic spell like Apocalypse return to D2, and the stylistic pentagram is very cool. But for a level 30 skill, I'm finding it pretty underwhelming. Who else feels that Apocalypse costs way too much mana and takes way too long to activate for not enough effect?