Simply avoiding setting a master key is sufficient to have a non-HD wallet, with the latest wallet version (ie, no-default-key)
Motivation: I intend to rebase #9662 on top of this, and from there add support for generic external wallet interfaces (such as HD wallets).