Commented/reverted some suse changes that snuck in test branch