Bring main template inline with Analytics hack that was done directly on server