revert cyrus-sasl to no autogenerated file version, add to build again