diff --git a/aodh/storage/impl_sqlalchemy.py b/aodh/storage/impl_sqlalchemy.py
index 53da0e61d..80901e8e6 100644
--- a/aodh/storage/impl_sqlalchemy.py
+++ b/aodh/storage/impl_sqlalchemy.py
@@ -20,7 +20,6 @@ import os.path
 from alembic import command
 from alembic import config
 from alembic import migration
-from oslo_db import exception
 from oslo_db.sqlalchemy import session as db_session
 from oslo_db.sqlalchemy import utils as oslo_sql_utils
 from oslo_log import log
@@ -95,15 +94,8 @@ class Connection(base.Connection):
             ctxt = migration.MigrationContext.configure(engine.connect())
             current_version = ctxt.get_current_revision()
             if current_version is None:
-                try:
-                    models.Base.metadata.create_all(engine, checkfirst=False)
-                except exception.DBError:
-                    # Assume tables exist from Ceilometer, take control
-                    # FIXME(jd) Remove in Ocata
-                    command.stamp(cfg, "12fe8fac9fe4")
-                    command.upgrade(cfg, "head")
-                else:
-                    command.stamp(cfg, "head")
+                models.Base.metadata.create_all(engine, checkfirst=False)
+                command.stamp(cfg, "head")
             else:
                 command.upgrade(cfg, "head")