Moved to a safer implementation for JDBC.