Remove workaround for c# generation bug