MFC: r267145

Fix the keyfile being cleared prematurely after r259428 (MFCed to stable/9
in r266750).

PR:		185084
Submitted by:	fk@fabiankeil.de
Reviewed by:	pjd