Revert "Private key can be in extra file"

This commit breaks testsuite (make check)

This reverts commit ba18c375e693529cae29e25aaad24c52f5892c2d.