Fix for #204: Revert change from #163 - Add back support for DataSource with autocommit=true