Revert regression in r538 bypassing kinit.