Revert PR #2531
Created by: epiclabsDASH
Revert PR #2531. We need to find a way of re-implementing it without breaking multi-track support.
Created by: epiclabsDASH
Revert PR #2531. We need to find a way of re-implementing it without breaking multi-track support.