Mozilla Connect

How do I disable auto pinning and grouping, these new "features" have made it very frustrating to re-order tabs and there doesn't appear to be a way to disable them either.