Index: /trunk/src/VBox/Main/include/VirtualBoxImpl.h
===================================================================
--- /trunk/src/VBox/Main/include/VirtualBoxImpl.h	(revision 50355)
+++ /trunk/src/VBox/Main/include/VirtualBoxImpl.h	(revision 50356)
@@ -61,5 +61,5 @@
     public VirtualBoxWrap
 #ifdef RT_OS_WINDOWS
-    , public CComCoClass<VirtualBox, &CLSID_VirtualBox>
+//     , public CComCoClass<VirtualBox, &CLSID_VirtualBox>
 #endif
 {
Index: /trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp	(revision 50355)
+++ /trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp	(revision 50356)
@@ -1256,9 +1256,9 @@
 static void sanitiseMachineFilename(Utf8Str &aName);
 
-STDMETHODIMP VirtualBox::composeMachineFilename(const com::Utf8Str &aName,
-                                                const com::Utf8Str &aGroup,
-                                                const com::Utf8Str &aCreateFlags,
-                                                const com::Utf8Str &aBaseFolder,
-                                                com::Utf8Str       &aFile)
+HRESULT VirtualBox::composeMachineFilename(const com::Utf8Str &aName,
+                                           const com::Utf8Str &aGroup,
+                                           const com::Utf8Str &aCreateFlags,
+                                           const com::Utf8Str &aBaseFolder,
+                                           com::Utf8Str       &aFile)
 {
     LogFlowThisFuncEnter();