0.6.2: Revert 0.6.1 because it breaks tracks() options usage.