Revert "Merge branch '996-wrong-key-id-is-displayed-for-rsamd5-keys' into 'master'"

This reverts commit ea131d2e, reversing changes made to e79dd268.

Closes #996 (closed)