Switch back to 8.x-1.x for testing with Multiversion