Oh and they went back to it:

For Holy and Discipline, Power Word: Solace replaces Holy Fire. It deals the same damage, and interacts with other spells and abilities in the same manner, but is instant, costs no mana, and restores 1% of maximum mana on each cast.

http://us.battle.net/wow/en/blog/822...y_30-1_30_2013