This reverts commit 4274f49ada. The SASL mech was choking on this, so let's send it back for some more refining.
4274f49ada