Revert "Merge branch 'add_trackT0_info' into '2018-patches'"

This reverts merge request !462 (merged) as it is not needed for the urgent stack release for S34r0p1.