diff --git a/gapi.xsd b/gapi.xsd
index bd6c05575..592595a63 100644
--- a/gapi.xsd
+++ b/gapi.xsd
@@ -206,7 +206,6 @@
         <xs:attribute name="hidden" type="xs:boolean" use="optional"/>
         <xs:attribute name="preferred" type="xs:boolean" use="optional"/>
         <xs:attribute name="shared" type="xs:boolean" use="optional"/>
-        <xs:attribute name="win32_utf8_variant" type="xs:boolean" use="optional"/>
     </xs:complexType>
 
 	<xs:complexType name="fieldType">
@@ -250,7 +249,6 @@
         <xs:attribute name="library" type="xs:string" use="optional"/>
         <xs:attribute name="deprecated" type="xs:boolean" use="optional"/>
         <xs:attribute name="hidden" type="xs:boolean" use="optional"/>
-        <xs:attribute name="win32_utf8_variant" type="xs:boolean" use="optional"/>
     </xs:complexType>
 
     <xs:complexType name="propertyType">
diff --git a/generator/Method.cs b/generator/Method.cs
index d8859e95c..74423b873 100644
--- a/generator/Method.cs
+++ b/generator/Method.cs
@@ -34,7 +34,6 @@ namespace GtkSharp.Generation {
 		private string call;
 		private bool is_get, is_set;
 		private bool deprecated = false;
-		private bool win32_utf8_variant = false;
 
 		public Method (XmlElement elem, ClassBase container_type) : base (elem, container_type)
 		{
@@ -44,16 +43,10 @@ namespace GtkSharp.Generation {
 				deprecated = elem.GetAttributeAsBoolean ("deprecated");
 			}
 			
-			win32_utf8_variant = elem.GetAttributeAsBoolean ("win32_utf8_variant");
-
 			if (Name == "GetType")
 				Name = "GetGType";
 		}
 
-		public bool HasWin32Utf8Variant {
-			get { return win32_utf8_variant; }
-		}
-
 		public bool IsDeprecated {
 			get {
 				return deprecated;
@@ -204,15 +197,6 @@ namespace GtkSharp.Generation {
 			else
 				sw.WriteLine("\t\tstatic extern " + Safety + retval.MarshalType + " " + CName + "(" + import_sig + ");");
 			sw.WriteLine();
-
-			if (HasWin32Utf8Variant) {
-				sw.WriteLine("\t\t[DllImport(\"" + LibraryName + "\")]");
-				if (retval.MarshalType.StartsWith ("[return:"))
-					sw.WriteLine("\t\t" + retval.MarshalType + " static extern " + Safety + retval.CSType + " " + CName + "_utf8(" + import_sig + ");");
-				else
-					sw.WriteLine("\t\tstatic extern " + Safety + retval.MarshalType + " " + CName + "_utf8(" + import_sig + ");");
-				sw.WriteLine();
-			}
 		}
 
 		public void GenerateOverloads (StreamWriter sw)
@@ -304,33 +288,14 @@ namespace GtkSharp.Generation {
 				Body.InitAccessor (sw, Signature, indent);
 			Body.Initialize(gen_info, is_get, is_set, indent);
 
-			if (HasWin32Utf8Variant) {
-				if (!retval.IsVoid)
-					sw.WriteLine(indent + "\t\t\t" + retval.MarshalType + " raw_ret;");
-				sw.WriteLine(indent + "\t\t\t" + "if (Environment.OSVersion.Platform == PlatformID.Win32NT ||");
-				sw.WriteLine(indent + "\t\t\t" + "    Environment.OSVersion.Platform == PlatformID.Win32S ||");
-				sw.WriteLine(indent + "\t\t\t" + "    Environment.OSVersion.Platform == PlatformID.Win32Windows ||");
-				sw.WriteLine(indent + "\t\t\t" + "    Environment.OSVersion.Platform == PlatformID.WinCE)");
-				if (retval.IsVoid) {
-					sw.WriteLine(indent + "\t\t\t\t" + CName + "_utf8" + call + ";");
-					sw.WriteLine(indent + "\t\t\t" + "else");
-					sw.WriteLine(indent + "\t\t\t\t" + CName + call + ";");
-				} else {
-					sw.WriteLine(indent + "\t\t\t\traw_ret = " + CName + "_utf8" + call + ";");
-					sw.WriteLine(indent + "\t\t\t" + "else");
-					sw.WriteLine(indent + "\t\t\t\traw_ret = " + CName + call + ";");
-					sw.WriteLine(indent + "\t\t\t" + retval.CSType + " ret = " + retval.FromNative ("raw_ret") + ";");
-				}
-			} else {
-				sw.Write(indent + "\t\t\t");
-				if (retval.IsVoid)
-					sw.WriteLine(CName + call + ";");
-				else {
-					sw.WriteLine(retval.MarshalType + " raw_ret = " + CName + call + ";");
-					sw.WriteLine(indent + "\t\t\t" + retval.CSType + " ret = " + retval.FromNative ("raw_ret") + ";");
-				}
+			sw.Write(indent + "\t\t\t");
+			if (retval.IsVoid)
+				sw.WriteLine(CName + call + ";");
+			else {
+				sw.WriteLine(retval.MarshalType + " raw_ret = " + CName + call + ";");
+				sw.WriteLine(indent + "\t\t\t" + retval.CSType + " ret = " + retval.FromNative ("raw_ret") + ";");
 			}
-
+			
 			if (!IsStatic && implementor != null)
 				implementor.Finish (sw, indent + "\t\t\t");
 			Body.Finish (sw, indent);
diff --git a/gtk/Gtk.metadata b/gtk/Gtk.metadata
index 51ceac237..e2566fc61 100644
--- a/gtk/Gtk.metadata
+++ b/gtk/Gtk.metadata
@@ -12,13 +12,10 @@
   <attr path="/api/namespace/boxed[@cname='GtkGradient']/method[@cname='gtk_gradient_resolve']" name="hidden">1</attr>
   <attr path="/api/namespace/boxed[@cname='GtkGradient']/method[@cname='gtk_gradient_resolve_for_context']" name="hidden">1</attr>
   <attr path="/api/namespace/boxed[@cname='GtkIconInfo']/method[@name='Free']" name="deprecated">1</attr>
-  <attr path="/api/namespace/boxed[@cname='GtkIconInfo']/method[@name='GetFilename']" name="win32_utf8_variant">true</attr>
   <attr path="/api/namespace/boxed[@cname='GtkIconSet']/method[@name='GetSizes']" name="hidden">1</attr>
   <attr path="/api/namespace/boxed[@cname='GtkIconSet']/method[@name='Ref']" name="deprecated">1</attr>
   <attr path="/api/namespace/boxed[@cname='GtkIconSet']/method[@name='Unref']" name="deprecated">1</attr>
   <attr path="/api/namespace/boxed[@cname='GtkIconSource']/method[@name='Free']" name="deprecated">1</attr>
-  <attr path="/api/namespace/boxed[@cname='GtkIconSource']/method[@name='GetFilename']" name="win32_utf8_variant">true</attr>
-  <attr path="/api/namespace/boxed[@cname='GtkIconSource']/method[@name='SetFilename']" name="win32_utf8_variant">true</attr>
   <attr path="/api/namespace/boxed[@cname='GtkPaperSize']/method[@name='GetPaperSizes']/return-type" name="element_type">GtkPaperSize*</attr>
   <attr path="/api/namespace/boxed[@cname='GtkPaperSize']/method[@name='GetPaperSizes']/return-type" name="owned">true</attr>
   <attr path="/api/namespace/boxed[@cname='GtkPaperSize']/method[@name='GetPaperSizes']/return-type" name="elements_owned">true</attr>
@@ -83,10 +80,7 @@
   <attr path="/api/namespace/class[@cname='GtkInit_']/method[@name='AbiCheck']" name="hidden">1</attr>
   <attr path="/api/namespace/class[@cname='GtkKey_']" name="hidden">1</attr>
   <attr path="/api/namespace/class[@cname='GtkPrint_']/method[@name='RunPageSetupDialogAsync']/*/*[@name='done_cb']" name="scope">async</attr>
-  <attr path="/api/namespace/class[@cname='GtkRc_']/method[@name='AddDefaultFile']" name="win32_utf8_variant">true</attr>
   <attr path="/api/namespace/class[@cname='GtkRc_']/method[@name='GetDefaultFiles']/return-type" name="null_term_array">1</attr>
-  <attr path="/api/namespace/class[@cname='GtkRc_']/method[@name='Parse']" name="win32_utf8_variant">true</attr>
-  <attr path="/api/namespace/class[@cname='GtkRc_']/method[@name='SetDefaultFiles']" name="win32_utf8_variant">true</attr>
   <attr path="/api/namespace/class[@cname='GtkRc_']/method[@name='SetDefaultFiles']/*/*[@name='filenames']" name="null_term_array">1</attr>
   <attr path="/api/namespace/class[@cname='GtkRc_']/method[@cname='gtk_rc_get_style_by_paths']" name="hidden">1</attr>
   <attr path="/api/namespace/class[@cname='GtkRc_']/method[@cname='gtk_rc_reparse_all_for_settings']" name="hidden">1</attr>
@@ -140,16 +134,12 @@
   <attr path="/api/namespace/interface[@cname='GtkEditable']/virtual_method[@cname='do_insert_text']/*/*[@name='position']" name="pass_as">ref</attr>
   <attr path="/api/namespace/interface[@cname='GtkEditable']/virtual_method[@name='SetSelectionBounds']" name="name">SelectRegion</attr>
   <attr path="/api/namespace/interface[@cname='GtkFileChooser']" name="consume_only">1</attr>
-  <attr path="/api/namespace/interface[@cname='GtkFileChooser']/method[@name='GetCurrentFolder']" name="win32_utf8_variant">true</attr>
   <attr path="/api/namespace/interface[@cname='GtkFileChooser']/method[@name='GetCurrentFolder']/return-type" name="type">gfilename*</attr>
-  <attr path="/api/namespace/interface[@cname='GtkFileChooser']/method[@name='GetFilename']" name="win32_utf8_variant">true</attr>
   <attr path="/api/namespace/interface[@cname='GtkFileChooser']/method[@name='GetFilename']/return-type" name="type">gfilename*</attr>
-  <attr path="/api/namespace/interface[@cname='GtkFileChooser']/method[@name='GetFilenames']" name="win32_utf8_variant">true</attr>
   <attr path="/api/namespace/interface[@cname='GtkFileChooser']/method[@name='GetFilenames']/return-type" name="owned">true</attr>
   <attr path="/api/namespace/interface[@cname='GtkFileChooser']/method[@name='GetFilenames']/return-type" name="element_type">gfilename*</attr>
   <attr path="/api/namespace/interface[@cname='GtkFileChooser']/method[@name='GetFilenames']/return-type" name="elements_owned">true</attr>
   <attr path="/api/namespace/interface[@cname='GtkFileChooser']/method[@name='GetFiles']/return-type" name="element_type">GFile*</attr>
-  <attr path="/api/namespace/interface[@cname='GtkFileChooser']/method[@name='GetPreviewFilename']" name="win32_utf8_variant">true</attr>
   <attr path="/api/namespace/interface[@cname='GtkFileChooser']/method[@name='GetPreviewFilename']/return-type" name="type">gfilename*</attr>
   <attr path="/api/namespace/interface[@cname='GtkFileChooser']/method/parameters/*[@name='filename']" name="type">const-gfilename*</attr>
   <attr path="/api/namespace/interface[@cname='GtkFileChooser']/method/parameters/*[@name='folder']" name="type">const-gfilename*</attr>
@@ -159,7 +149,6 @@
   <attr path="/api/namespace/interface[@cname='GtkFileChooser']/method[@cname='gtk_file_chooser_list_filters']" name="name">GetFilters</attr>
   <attr path="/api/namespace/interface[@cname='GtkFileChooser']/method[@cname='gtk_file_chooser_list_filters']/return-type" name="element_type">GtkFileFilter*</attr>
   <attr path="/api/namespace/interface[@cname='GtkFileChooser']/method[@cname='gtk_file_chooser_list_filters']/return-type" name="owned">true</attr>
-  <attr path="/api/namespace/interface[@cname='GtkFileChooser']/method[@cname='gtk_file_chooser_list_shortcut_folders']" name="win32_utf8_variant">true</attr>
   <attr path="/api/namespace/interface[@cname='GtkFileChooser']/method[@cname='gtk_file_chooser_list_shortcut_folders']" name="name">GetShortcutFolders</attr>
   <attr path="/api/namespace/interface[@cname='GtkFileChooser']/method[@cname='gtk_file_chooser_list_shortcut_folders']/return-type" name="owned">true</attr>
   <attr path="/api/namespace/interface[@cname='GtkFileChooser']/method[@cname='gtk_file_chooser_list_shortcut_folders']/return-type" name="element_type">gfilename*</attr>
@@ -168,12 +157,6 @@
   <attr path="/api/namespace/interface[@cname='GtkFileChooser']/method[@cname='gtk_file_chooser_list_shortcut_folder_uris']/return-type" name="element_type">gchar*</attr>
   <attr path="/api/namespace/interface[@cname='GtkFileChooser']/method[@cname='gtk_file_chooser_list_shortcut_folder_uris']/return-type" name="elements_owned">true</attr>
   <attr path="/api/namespace/interface[@cname='GtkFileChooser']/method[@cname='gtk_file_chooser_list_shortcut_folder_uris']/return-type" name="owned">true</attr>
-  <attr path="/api/namespace/interface[@cname='GtkFileChooser']/method[@name='RemoveShortcutFolder']" name="win32_utf8_variant">true</attr>
-  <attr path="/api/namespace/interface[@cname='GtkFileChooser']/method[@name='SelectFilename']" name="win32_utf8_variant">true</attr>
-  <attr path="/api/namespace/interface[@cname='GtkFileChooser']/method[@name='SetCurrentFolder']" name="win32_utf8_variant">true</attr>
-  <attr path="/api/namespace/interface[@cname='GtkFileChooser']/method[@name='SetFilename']" name="win32_utf8_variant">true</attr>
-  <attr path="/api/namespace/interface[@cname='GtkFileChooser']/method[@name='UnselectFilename']" name="win32_utf8_variant">true</attr>
-  <attr path="/api/namespace/interface[@cname='GtkFileChooser']/virtual_method[@name='AddShortcutFolder']" name="win32_utf8_variant">true</attr>
   <attr path="/api/namespace/interface[@cname='GtkFileChooser']/virtual_method[@name='GetFiles']/return-type" name="element_type">GFile*</attr>
   <attr path="/api/namespace/interface[@cname='GtkFileChooser']/virtual_method[@cname='get_file_system']" name="hidden">1</attr>
   <attr path="/api/namespace/interface[@cname='GtkFileChooser']/virtual_method[@name='ListFilters']" name="name">GetFilters</attr>
@@ -239,9 +222,7 @@
   <attr path="/api/namespace/object[@cname='GtkAccelGroup']/signal[@name='AccelActivate']/*/*[@name='p2']" name="name">modifier</attr>
   <attr path="/api/namespace/object[@cname='GtkAccelMap']/method[@name='Foreach']/*/*[@name='foreach_func']" name="scope">call</attr>
   <attr path="/api/namespace/object[@cname='GtkAccelMap']/method[@name='ForeachUnfiltered']/*/*[@name='foreach_func']" name="scope">call</attr>
-  <attr path="/api/namespace/object[@cname='GtkAccelMap']/method[@name='Load']" name="win32_utf8_variant">true</attr>
   <attr path="/api/namespace/object[@cname='GtkAccelMap']/method[@name='LookupEntry']/*/*[@name='key']" name="pass_as">out</attr>
-  <attr path="/api/namespace/object[@cname='GtkAccelMap']/method[@name='Save']" name="win32_utf8_variant">true</attr>
   <attr path="/api/namespace/object[@cname='GtkAccelMap']/signal[@name='Changed']" name="name">MapChanged</attr>
   <attr path="/api/namespace/object[@cname='GtkAccelMap']/signal[@name='MapChanged']/*/*[@name='p0']" name="name">accel_path</attr>
   <attr path="/api/namespace/object[@cname='GtkAccelMap']/signal[@name='MapChanged']/*/*[@name='p1']" name="name">accel_key</attr>
@@ -389,10 +370,8 @@
   <attr path="/api/namespace/object[@cname='GtkHandleBox']/property[@name='ShadowType']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GtkHandleBox']/method[@name='GetChildDetached']" name="name">IsChildDetached</attr>
   <attr path="/api/namespace/object[@cname='GtkHScale']/constructor[@cname='gtk_hscale_new_with_range']" name="hidden">1</attr>
-  <attr path="/api/namespace/object[@cname='GtkIconTheme']/method[@name='AppendSearchPath']" name="win32_utf8_variant">true</attr>
   <attr path="/api/namespace/object[@cname='GtkIconTheme']/method[@name='ChooseIcon']/*/*[@name='icon_names']" name="null_term_array">1</attr>
   <attr path="/api/namespace/object[@cname='GtkIconTheme']/method[@name='GetIconSizes']" name="hidden">1</attr>
-  <attr path="/api/namespace/object[@cname='GtkIconTheme']/method[@name='GetSearchPath']" name="win32_utf8_variant">true</attr>
   <attr path="/api/namespace/object[@cname='GtkIconTheme']/method[@name='GetSearchPath']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GtkIconTheme']/method[@name='ListContexts']/return-type" name="element_type">gchar*</attr>
   <attr path="/api/namespace/object[@cname='GtkIconTheme']/method[@name='ListContexts']/return-type" name="owned">true</attr>
@@ -402,8 +381,6 @@
   <attr path="/api/namespace/object[@cname='GtkIconTheme']/method[@name='LookupIcon']/return-type" name="owned">true</attr>
   <attr path="/api/namespace/object[@cname='GtkIconTheme']/method[@cname='gtk_icon_theme_lookup_by_gicon']/return-type" name="owned">true</attr>
   <attr path="/api/namespace/object[@cname='GtkIconTheme']/method[@cname='gtk_icon_theme_lookup_by_gicon']" name="name">LookupIcon</attr>
-  <attr path="/api/namespace/object[@cname='GtkIconTheme']/method[@name='PrependSearchPath']" name="win32_utf8_variant">true</attr>
-  <attr path="/api/namespace/object[@cname='GtkIconTheme']/method[@name='SetSearchPath']" name="win32_utf8_variant">true</attr>
   <attr path="/api/namespace/object[@cname='GtkIconTheme']/method[@name='SetSearchPath']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GtkIconView']/method[@name='EnableModelDragDest']/*/*[@name='targets']" name="array">1</attr>
   <attr path="/api/namespace/object[@cname='GtkIconView']/method[@name='EnableModelDragSource']/*/*[@name='targets']" name="array">1</attr>
@@ -432,7 +409,6 @@
   <attr path="/api/namespace/object[@cname='GtkImageMenuItem']/constructor[@cname='gtk_image_menu_item_new_with_mnemonic']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GtkImageMenuItem']/constructor[@cname='gtk_image_menu_item_new_with_label']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GtkImage']/constructor[@cname='gtk_image_new_from_animation']/*/*[@name='animation']" name="property_name">pixbuf_animation</attr>
-  <attr path="/api/namespace/object[@cname='GtkImage']/constructor[@cname='gtk_image_new_from_file']" name="win32_utf8_variant">true</attr>
   <attr path="/api/namespace/object[@cname='GtkImage']/constructor[@cname='gtk_image_new_from_file']/*/*[@name='filename']" name="property_name">file</attr>
   <attr path="/api/namespace/object[@cname='GtkImage']/constructor[@cname='gtk_image_new_from_icon_name']" name="shared">true</attr>
   <attr path="/api/namespace/object[@cname='GtkImage']/constructor[@cname='gtk_image_new_from_icon_set']" name="hidden">1</attr>
@@ -440,7 +416,6 @@
   <attr path="/api/namespace/object[@cname='GtkImage']/method[@name='GetIconSet']/*/*[@name='icon_set']" name="pass_as">out</attr>
   <attr path="/api/namespace/object[@cname='GtkImage']/method[@name='GetStock']/*/*[@name='stock_id']" name="pass_as">out</attr>
   <attr path="/api/namespace/object[@cname='GtkImage']/method[@name='SetFromAnimation']" name="name">SetAnimation</attr>
-  <attr path="/api/namespace/object[@cname='GtkImage']/method[@cname='gtk_image_set_from_file']" name="win32_utf8_variant">true</attr>
   <attr path="/api/namespace/object[@cname='GtkImage']/method[@name='SetFromFile']" name="name">SetFile</attr>
   <attr path="/api/namespace/object[@cname='GtkImage']/method[@name='SetFromPixbuf']" name="name">SetPixbuf</attr>
   <attr path="/api/namespace/object[@cname='GtkImage']/method[@cname='gtk_image_get_gicon']/*/parameter[@name='gicon']" name="pass_as">out</attr>
@@ -837,7 +812,6 @@
   <attr path="/api/namespace/object[@cname='GtkTreeView']/method[@name='SetVadjustment']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GtkUIManager']/constructor[@cname='gtk_ui_manager_new_merge_id']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GtkUIManager']/method[@name='AddUiFromResource']" name="hidden">1</attr>
-  <attr path="/api/namespace/object[@cname='GtkUIManager']/method[@name='AddUiFromFile']" name="win32_utf8_variant">true</attr>
   <attr path="/api/namespace/object[@cname='GtkUIManager']/method[@cname='gtk_ui_manager_get_action_groups']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GtkUIManager']/method[@name='GetToplevels']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GtkViewport']/method[@name='GetHadjustment']" name="hidden">1</attr>
@@ -911,9 +885,7 @@
   <attr path="/api/namespace/object[@cname='GtkWindow']/method[@name='IsActive']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GtkWindow']/method[@name='ListToplevels']/return-type" name="element_type">GtkWindow*</attr>
   <attr path="/api/namespace/object[@cname='GtkWindow']/method[@name='ListToplevels']/return-type" name="owned">true</attr>
-  <attr path="/api/namespace/object[@cname='GtkWindow']/method[@name='SetDefaultIconFromFile']" name="win32_utf8_variant">true</attr>
   <attr path="/api/namespace/object[@cname='GtkWindow']/method[@name='SetDefaultIconList']" name="hidden">1</attr>
-  <attr path="/api/namespace/object[@cname='GtkWindow']/method[@name='SetIconFromFile']" name="win32_utf8_variant">true</attr>
   <attr path="/api/namespace/object[@cname='GtkWindow']/method[@name='SetIconList']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GtkWindow']/property[@name='Screen']" name="new_flag">1</attr>
   <attr path="/api/namespace/object[@cname='GtkWindow']/property[@cname='is-maximized']" name="name">Maximized</attr>