Remove hostname switching