Now that the (lame) script for WM 25 has been leaked, do u think we'll still have Taker vs HBK?

Or it's possible they will still face each other, but with a different storyline ? Like JBL orders HBK to take out Taker at WM 25 and if he fails, he will be fired.