MFC: r267145Fix the keyfile being cleared prematurely after r259428 (MFCed to stable/9in r266750).PR: 185084Submitted by: fk@fabiankeil.deReviewed by: pjdApproved by: re (glebius)