Can you resubmit this PR because all the non-analytics commits are confusing