r21046: Backing out svn r20403 (Andrew's krb5 ticket cleanup