DON'T MERGE please

just for future assistance against systemgroup crud (right now blocked by: https://bugzilla.redhat.com/show_bug.cgi?id=1080475