diff --git a/libraries/adodb/adodb-datadict.inc.php b/libraries/adodb/adodb-datadict.inc.php
index 8b07e204a01b629a1e18303147b8a9d235b7eeef..dbf12a5d17637b4b3448a51e33a547fa5a01f784 100644
--- a/libraries/adodb/adodb-datadict.inc.php
+++ b/libraries/adodb/adodb-datadict.inc.php
@@ -750,7 +750,8 @@ class ADODB_DataDict {
 			if ($fdefts) {
 				if (substr($this->connection->databaseType,0,5) == 'mysql') {
 					$ftype = 'TIMESTAMP';
-					$fdefault = ' CURRENT_TIMESTAMP'; /* STRICT_TRANS_TABLES fix */
+					// Fix works only for MySQL 5.6 (which allows one or more column to have default timestamp
+					// $fdefault = ' CURRENT_TIMESTAMP'; /* STRICT_TRANS_TABLES fix */
 				} else {
 					$fdefault = $this->connection->sysTimeStamp;
 				}
diff --git a/schema/DatabaseSchema.xml b/schema/DatabaseSchema.xml
index 08c0f29bf5eb3e42344758725257a9d5b0c9ff45..f9a3b22c05eafa5dbd7b90fbea89347aded4e95c 100644
--- a/schema/DatabaseSchema.xml
+++ b/schema/DatabaseSchema.xml
@@ -28,8 +28,11 @@
 			<deftimestamp />
 		</field>
 		<field name="date_modified" type="T">
+			<!-- Troublesome with STRICT_TRANS_TABLE mode depends on MySQL 5.5 or 5.6+ -->
+			<!--
 			<notnull />
 			<deftimestamp />
+			-->
 		</field>
 		<field name="modified_user_id" type="C" size="36" />
 		<field name="title" type="C" size="50" />
@@ -1780,8 +1783,11 @@
 			<deftimestamp />
 		</field>
 		<field name="date_modified" type="T">
+            <!-- Troublesome with STRICT_TRANS_TABLE mode depends on MySQL 5.5 or 5.6+ -->
+			<!--
 			<notnull />
 			<deftimestamp />
+			-->
 		</field>
 		<field name="assigned_user_id" type="C" size="36" />
 		<field name="is_published" type="C" size="3">