Re-add C# workaround, because there is still a bug apparently.