Re-do mysql_* instances to use the DBAPI.
These must have been accidentally reverted in a merge somewhere.