RPM and tarball options restored to original differences