Reverts commit 795038a6 because d6d3c9af provides the same functionality in a more generic way. Both patches applied however means that the VPE and TC IDs get printed twice currently.