Revert "Merge pull request #34 from dscherer/tb/scp_support"

This reverts commit d991e9b94f07c761f9349c98e307a8922bc8f241, reversing
changes made to b61ae810198b3cd831ea2a952e452d02f37c7f01.
Merge pull request #36 from nanliu/revert

Revert "Merge pull request #34 from dscherer/tb/scp_support"