The current commentary team would make a angle like that unbearable.
Every match would just Cole, JBL and King fighting about how zayn is/isnt the masked wrestler.
Cole: Wouldn't you say, that so to speak, some would say, that so-called some would think that they are clearly the same person?
JBL: WHAT!? THAT'S THE STUPIDEST THING I'VE EVER HEARD
King: You know-
JBL: YOU'D HAVE TO BE A COMPLETE MORON IDIOT TO THINK THAT! COMPLETE STUPIDTY! YOU'RE NOT A JOURNALIST! BLACK HELICOPTERS!
Meanwhile the match has concluded and we're going to commercial.