diff --git a/rhn-client-tools.spec b/rhn-client-tools.spec
index c556226307..85a029d318 100644
--- a/rhn-client-tools.spec
+++ b/rhn-client-tools.spec
@@ -5,7 +5,7 @@ Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.
 URL:     https://fedorahosted.org/spacewalk
 Name: rhn-client-tools
 Version: 2.0.2
-Release: 16%{?dist}
+Release: 17%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 %if 0%{?suse_version}
@@ -361,6 +361,9 @@ make -f Makefile.rhn-client-tools test
 %endif
 
 %changelog
+* Fri Jun 30 2017 Tomas Lestach <tlestach@redhat.com> 2.0.2-17
+- Reverts: bz 1415742 - rhn-search traceback - immediateTrigger-server exists with certain identification" (michael.mraka@redhat.com)
+
 * Thu Jun 29 2017 Gennadii Altukhov <galt@redhat.com> 2.0.2-16
 - Resolves: #1415742 - rhn-search traceback - immediateTrigger-server exists
   with certain identification1415742 - rhn-search traceback - immediateTrigger-
diff --git a/src/up2date_client/up2dateUtils.py b/src/up2date_client/up2dateUtils.py
index 0147610412..1c9f40dbf0 100644
--- a/src/up2date_client/up2dateUtils.py
+++ b/src/up2date_client/up2dateUtils.py
@@ -12,11 +12,6 @@ import up2dateErrors
 import config
 import gettext
 from pkgplatform import getPlatform
-from up2date_client import up2dateErrors
-from up2date_client import config
-from up2date_client.pkgplatform import getPlatform
-from rhn.i18n import sstr
-
 t = gettext.translation('rhn-client-tools', fallback=True)
 _ = t.ugettext
 
@@ -37,17 +32,17 @@ else:
         ts = transaction.initReadOnlyTransaction()
         for h in ts.dbMatch('Providename', "redhat-release"):
             SYSRELVER = 'system-release(releasever)'
-            version = sstr(h['version'])
-            release = sstr(h['release'])
+            version = h['version']
+            release = h['release']
             if SYSRELVER in h['providename']:
                 provides = dict(zip(h['providename'], h['provideversion']))
                 release = '%s-%s' % (version, release)
                 version = provides[SYSRELVER]
-            osVersionRelease = (sstr(h['name']), version, release)
+            osVersionRelease = (h['name'], version, release)
             return osVersionRelease
         else:
             for h in ts.dbMatch('Providename', "distribution-release"):
-                osVersionRelease = (sstr(h['name']), sstr(h['version']), sstr(h['release']))
+                osVersionRelease = (h['name'], h['version'], h['release'])
                 # zypper requires a exclusive lock on the rpmdb. So we need
                 # to close it here.
                 ts.ts.closeDB()