If that's the case, I'm not entirely sure that they'll be going back to the Great Wheel cosmology (they weren't, but the Outer Planes were at least going to largely resemble it, but this however really doesn't fit if that's the case).
It looks like they're trying to do some sort of compromise...