Remove workaround for C# generation bug