IIRC, wasn't scp going to be rewritten in terms of SFTP behind the scenes?