Revert "Merge branch 'alexgilman_v2tracks' into 'master'"

Gerhard Ravenrequested to merge
revert-2d9c1aca into master

This reverts merge request !2356 (merged) which was accidentally merged with problems.

Edited by Alex Pearce

Merge request reports