Fix #676108. Original patch by greenSkin, heavily modified by me to hopefully maximize compatibility.

In theory, this should work in both keys_api and keys now.