Yemen president returns, snap election scheduled