Reverted analytics code change
Merge