i wouldnt expect them to redo/reexamine this work once 2.0 is released. once implemented, its a safe bet that its staying.

After all, YoshiP did state that it was primarily done this way for PvP.