revert previous cyrus-sasl change