Yemeni separatists abandon self-rule, mending rift