diff --git a/coreapi/call_log.c b/coreapi/call_log.c
index 9bbc4c753..1e8a3786c 100644
--- a/coreapi/call_log.c
+++ b/coreapi/call_log.c
@@ -376,8 +376,7 @@ void linphone_core_call_log_storage_init(LinphoneCore *lc) {
 
 	linphone_core_call_log_storage_close(lc);
 
-	//ret=_linphone_sqlite3_open(lc->logs_db_file, &db);
-	ret = sqlite3_open(lc->logs_db_file, &db);
+	ret=_linphone_sqlite3_open(lc->logs_db_file, &db);
 	if(ret != SQLITE_OK) {
 		errmsg = sqlite3_errmsg(db);
 		ms_error("Error in the opening: %s.\n", errmsg);
diff --git a/coreapi/friend.c b/coreapi/friend.c
index f69314375..2251b370c 100644
--- a/coreapi/friend.c
+++ b/coreapi/friend.c
@@ -1141,8 +1141,7 @@ void linphone_core_friends_storage_init(LinphoneCore *lc) {
 
 	linphone_core_friends_storage_close(lc);
 
-	//ret = _linphone_sqlite3_open(lc->friends_db_file, &db);
-	ret = sqlite3_open(lc->friends_db_file, &db);
+	ret = _linphone_sqlite3_open(lc->friends_db_file, &db);
 	if (ret != SQLITE_OK) {
 		errmsg = sqlite3_errmsg(db);
 		ms_error("Error in the opening: %s.\n", errmsg);
diff --git a/coreapi/message_storage.c b/coreapi/message_storage.c
index dc13d8f27..877a0471e 100644
--- a/coreapi/message_storage.c
+++ b/coreapi/message_storage.c
@@ -80,7 +80,8 @@ int _linphone_sqlite3_open(const char *db_file, sqlite3 **db) {
 #endif
 	
 	char *utf8_filename = utf8_convert(db_file);
-	ret = sqlite3_open_v2(utf8_filename, db, flags, LINPHONE_SQLITE3_VFS);
+	//ret = sqlite3_open_v2(utf8_filename, db, flags, LINPHONE_SQLITE3_VFS);
+	ret = sqlite3_open_v2(utf8_filename, db, flags, NULL); // Do not use VFS until all issues are resolved
 	ms_free(utf8_filename);
 
 	if (ret != SQLITE_OK) return ret;
@@ -695,8 +696,7 @@ void linphone_core_message_storage_init(LinphoneCore *lc){
 
 	linphone_core_message_storage_close(lc);
 
-	//ret=_linphone_sqlite3_open(lc->chat_db_file,&db);
-	ret = sqlite3_open(lc->chat_db_file,&db);
+	ret=_linphone_sqlite3_open(lc->chat_db_file,&db);
 	if(ret != SQLITE_OK) {
 		errmsg=sqlite3_errmsg(db);
 		ms_error("Error in the opening: %s.\n", errmsg);