Please note that I've only made this change in the 'autotrack' branch, and is never supposed to be merged back into master..