Revert previous SASL fix (wrong approach)