Partially revert r247892 and r247904 since our strnvis() does not
behave the way OpenSSH expects.