diff --git a/SOURCES/0673-Revert-bus-when-dumping-string-property-values-escap.patch b/SOURCES/0673-Revert-bus-when-dumping-string-property-values-escap.patch
new file mode 100644
index 0000000..9e0352c
--- /dev/null
+++ b/SOURCES/0673-Revert-bus-when-dumping-string-property-values-escap.patch
@@ -0,0 +1,94 @@
+From 8e5cb71473f8392a69eee0acea11e198ce7cd4c9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Sat, 1 Jul 2017 16:17:12 -0400
+Subject: [PATCH] Revert "bus: when dumping string property values escape the
+ chars we use as end-of-line and end-of-item marks"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This reverts commit 27e9c5af817147ea1c678769e45e83f2e4b4ae96.
+
+Property values already use escaping, so escaping them a second time is
+confusing. It also should be mostly unnecessary: we take care to make property
+values only contains strings which (after the initial escaping) are printable
+and parseable without any futher escaping.
+
+Before revert:
+$ systemctl list-dependencies 'dev-mapper-luks\x2d8db85dcf\x2d6230\x2d4e88\x2d940d\x2dba176d062b31.device'
+dev-mapper-luks\x2d8db85dcf\x2d6230\x2d4e88\x2d940d\x2dba176d062b31.device
+● ├─dev-mapper-luks\x2d8db85dcf\x2d6230\x2d4e88\x2d940d\x2dba176d062b31.swap
+● └─systemd-cryptsetup@luks\x2d8db85dcf\x2d6230\x2d4e88\x2d940d\x2dba176d062b31.service
+$ systemctl show -p Wants,Requires 'dev-mapper-luks\x2d8db85dcf\x2d6230\x2d4e88\x2d940d\x2dba176d062b31.device'
+Requires=systemd-cryptsetup@luks\x5cx2d8db85dcf\x5cx2d6230\x5cx2d4e88\x5cx2d940d\x5cx2dba176d062b31.service
+Wants=dev-mapper-luks\x5cx2d8db85dcf\x5cx2d6230\x5cx2d4e88\x5cx2d940d\x5cx2dba176d062b31.swap
+
+Difference between systemctl show before revert and now:
+-Slice=system-systemd\x5cx2dcryptsetup.slice
++Slice=system-systemd\x2dcryptsetup.slice
+
+-Id=systemd-cryptsetup@luks\x5cx2d8db85dcf\x5cx2d6230\x5cx2d4e88\x5cx2d940d\x5cx2dba176d062b31.service
++Id=systemd-cryptsetup@luks\x2d8db85dcf\x2d6230\x2d4e88\x2d940d\x2dba176d062b31.service
+
+-Names=systemd-cryptsetup@luks\x5cx2d8db85dcf\x5cx2d6230\x5cx2d4e88\x5cx2d940d\x5cx2dba176d062b31.service
++Names=systemd-cryptsetup@luks\x2d8db85dcf\x2d6230\x2d4e88\x2d940d\x2dba176d062b31.service
+
+-Requires=system-systemd\x5cx2dcryptsetup.slice
++Requires=system-systemd\x2dcryptsetup.slice
+
+-BindsTo=dev-mapper-luks\x5cx2d8db85dcf\x5cx2d6230\x5cx2d4e88\x5cx2d940d\x5cx2dba176d062b31.device dev-disk-by\x5cx2duuid-8db85dcf\x5cx2d6230\x5cx2d4e88\x5cx2d940d\x5cx2dba176d062b31.device
++BindsTo=dev-mapper-luks\x2d8db85dcf\x2d6230\x2d4e88\x2d940d\x2dba176d062b31.device dev-disk-by\x2duuid-8db85dcf\x2d6230\x2d4e88\x2d940d\x2dba176d062b31.device
+
+-RequiredBy=dev-mapper-luks\x5cx2d8db85dcf\x5cx2d6230\x5cx2d4e88\x5cx2d940d\x5cx2dba176d062b31.device cryptsetup.target
++RequiredBy=dev-mapper-luks\x2d8db85dcf\x2d6230\x2d4e88\x2d940d\x2dba176d062b31.device cryptsetup.target
+
+-WantedBy=dev-disk-by\x5cx2duuid-8db85dcf\x5cx2d6230\x5cx2d4e88\x5cx2d940d\x5cx2dba176d062b31.device
++WantedBy=dev-disk-by\x2duuid-8db85dcf\x2d6230\x2d4e88\x2d940d\x2dba176d062b31.device
+
+(cherry picked from commit 3dfbc968e8343172faf754a3c81e27f0dbd8f157)
+
+Resolves: #1643172
+---
+ src/libsystemd/sd-bus/bus-util.c | 19 +++----------------
+ 1 file changed, 3 insertions(+), 16 deletions(-)
+
+diff --git a/src/libsystemd/sd-bus/bus-util.c b/src/libsystemd/sd-bus/bus-util.c
+index b1bdbad2d..9b77059a9 100644
+--- a/src/libsystemd/sd-bus/bus-util.c
++++ b/src/libsystemd/sd-bus/bus-util.c
+@@ -643,15 +643,8 @@ int bus_print_property(const char *name, sd_bus_message *property, bool all) {
+ if (r < 0)
+ return r;
+
+- if (all || !isempty(s)) {
+- _cleanup_free_ char *escaped = NULL;
+-
+- escaped = xescape(s, "\n");
+- if (!escaped)
+- return -ENOMEM;
+-
+- printf("%s=%s\n", name, escaped);
+- }
++ if (all || !isempty(s))
++ printf("%s=%s\n", name, s);
+
+ return 1;
+ }
+@@ -742,16 +735,10 @@ int bus_print_property(const char *name, sd_bus_message *property, bool all) {
+ return r;
+
+ while((r = sd_bus_message_read_basic(property, SD_BUS_TYPE_STRING, &str)) > 0) {
+- _cleanup_free_ char *escaped = NULL;
+-
+ if (first)
+ printf("%s=", name);
+
+- escaped = xescape(str, "\n ");
+- if (!escaped)
+- return -ENOMEM;
+-
+- printf("%s%s", first ? "" : " ", escaped);
++ printf("%s%s", first ? "" : " ", str);
+
+ first = false;
+ }
diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec
index 87a66cc..1746f92 100644
--- a/SPECS/systemd.spec
+++ b/SPECS/systemd.spec
@@ -7,7 +7,7 @@
Name: systemd
Url: http://www.freedesktop.org/wiki/Software/systemd
Version: 219
-Release: 62%{?dist}.5
+Release: 62%{?dist}.6
# For a breakdown of the licensing, see README
License: LGPLv2+ and MIT and GPLv2+
Summary: A System and Service Manager
@@ -711,6 +711,7 @@ Patch0669: 0669-journald-free-cmdline-buffers-owned-by-iovec.patch
Patch0670: 0670-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patch
Patch0671: 0671-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch
Patch0672: 0672-sd-bus-if-we-receive-an-invalid-dbus-message-ignore-.patch
+Patch0673: 0673-Revert-bus-when-dumping-string-property-values-escap.patch
%global num_patches %{lua: c=0; for i,p in ipairs(patches) do c=c+1; end; print(c);}
@@ -1687,6 +1688,9 @@ fi
%{_mandir}/man8/systemd-resolved.*
%changelog
+* Thu Mar 21 2019 Lukas Nykryn <lnykryn@redhat.com> - 219-62.6
+- Revert "bus: when dumping string property values escape the chars we use as end-of-line and end-of-item marks" (#1643172)
+
* Thu Feb 14 2019 Lukas Nykryn <lnykryn@redhat.com> - 219-62.5
- sd-bus: if we receive an invalid dbus message, ignore and proceeed (#1667871)