Revert tweak written for psycopg
Remove hack for old psycopg