diff --git a/ChangeLog b/ChangeLog
index ec0a32436..62296c055 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-12-01  Alexey Shchepin  <alexey@process-one.net>
 
+	* src/odbc/odbc_queries.erl: Reverted the previous patch because
+	it produces "redefining macro 'generic'" compilation error
+
 	* src/mod_caps.erl: CAPS support (thanks to Magnus Henoch)
 	* src/ejabberd_local.erl: Support for IQ responses
 	* src/jlib.erl: Added iq_query_or_response_info/1 function
diff --git a/src/odbc/odbc_queries.erl b/src/odbc/odbc_queries.erl
index 7748ed21e..33717c59b 100644
--- a/src/odbc/odbc_queries.erl
+++ b/src/odbc/odbc_queries.erl
@@ -44,9 +44,9 @@
 %% We have only two compile time options for db queries:
 %-define(generic, true).
 %-define(mssql, true).
--ifndef(mssql).
--define(generic, true).
--endif.
+%-ifndef(mssql).
+%-define(generic, true).
+%-endif.
 
 %% -----------------
 %% Generic queries