Reapplied fix for https://bugzilla.redhat.com/show_bug.cgi?id=923012