reversed some breakage to make the RPM build at expense of the SRPM perhaps