Move back to the gocql fork