bye bye SRP
move a comment to make unifdef happier
remove Kerberos
"stay backwards-compatible with 0.9.5; this should go away soon"
it's your lucky day!