Revert "add in send-via defer, but disable it for now"

This reverts commit 9d265193ec5e46edd945ff5188e5cb248cea3f92.