Revert "Merge branch 'alexgilman_v2tracks' into 'master'"
This reverts merge request !2356 (merged) which was accidentally merged with problems.
Edited by Alex Pearce
This reverts merge request !2356 (merged) which was accidentally merged with problems.