Ken Hornstein's SASL patch was not integrated properly with Ruud's new merged