Re-add dependency on cyrus-sasl