Due to bugs in v2 driver, reverting to v1