Issue 210 reverse handled keys

See commit messages for both commits for specifics