Started work on https://bugzilla.redhat.com/show_bug.cgi?id=1035949