Need help backing away from changes that break the Rawhide builds