revert previous cyrus-sasl commit