Revert "skin tags: fix the id3 track/disc numbers in conditionals"