Another stab at fixing omniauth, part 2