Fix ssh2-cisco-pw-pad by reverting r5122. However, I've kept the