Reverted back to new GA tracking code