Having said that, it's probably ok to leave this here, as this function should only be called after this check has happened. Hmmmm.

It might be ok to fix this patch set up and then leave it, and wait for edit-key to be merged in? Then it can be rebased, and merged?