Backport fix from trunk for SASL bug.