A previous fix for the ordering of tabs was actually wrong.
I'm reverting that here. Will need more details fixing later.