Quick and dirty fix that removes default host