Kerberos cosmetic changes: Revert a part of the patch