Remove workaround for jdbc bug that has been fixed