Uh, really fix Analytics this time.