Still awaiting the updates.  I would recommend not removing your tokens from stacking at the the moment.  Not until further updates are given.