v2.2.8 - Fix route tracker entity

Fixes the route tracker entity which was broken in v2.2.6
Also reverts other changes introduced in v2.2.7 that were not ready.

Full Changelog: v2.2.7...v2.2.8