Note the revert of JDBC-40