Revert to old track switching logic