No more machine dependent host names-- for now