Restore compatibility with variants without trackspecs as well