Scary thought re Corbin

I just had a scary thought re: Baron Corbin;  He goes on to not only win the King Of The Ring tournament, but because he can't challenge for the WWE Universal Title for as long as Seth Rollins is champ,(assuming they even remember that stipulation from "Extreme Rules"), he goes to Smackdown to challenge Kofi Kingston for the WWE Championship just in time for Smackdown's debut on Fox.  

Although they wouldn't likely remember their own stips, I'm pretty sure that "no more title matches" clause was invalidated by Brock winning the title and then Seth starting a new reign at Summerslam.