Since commit a3749cd5 removed the need to work around some NSS/SSH
shortcomings, we can now get rid of the last vestiges of the
workarounds, simplifying the code.

Signed-off-by: Emanuele Aina <emanuele.aina@collabora.com>