Revert "Working out bugs with track select"

This reverts commit a6f00c1ecafd602e6fc2848eb28513a079997e70.