Revert "C# Refactoring problem"

This reverts commit 11c9655606b5b240f8b211bf1cd5bc1249dee3d2.