Reverted svet-krb's bad comit.