CSharp: Revert most of the features added in #354
Merge pull request #355 from Joshua-Anderson/csharp-revert-fixes

CSharp: Revert most of the features added in #354