Bug 3160 - Revert patch for Bug 2373

Revert "[#2373] Support for TrackEvent and PopcornWrapper to use Popcorn trackevent update method."

This reverts commit c65dfca81b05b1d5b97d1bb61b1eb37f6e414f40.