Partial revert of f0c02aa58944ed58ae6409489fb532093bf5c2c6Signed-off-by: Tom Jenkinson <tom.jenkinson@redhat.com> (commit: 47eb448)