Remove C# workaround, for real this time