Revert 9b9b91c..2a503c7

This rolls back to commit 9b9b91c32c23f10c35d80c3800fed4c0427eb1ed.
Fixed Seg-Fault Issue with SendMsg