Revert "This version is only work with the ubiquitous_database_brian.sql"

This reverts commit 8a0fdca211a85ec7a95b728858b39d87babe7ccb.