We need to revert the changes introduced with the following: https://bugzilla.redhat.com/show_bug.cgi?id=1783044 There could be more, if so please add them to the list with additional comments.