Disable Zune 3 software from adding "Disc Number" ID3 tags...?

[raintheory]

IS there a way to disable the new Zune software from automatically adding the Disc Number metadata? It's quite irritating (I'm picky about my metadata and how I organize things, etc)... Every time I drag an album into the Zune software it adds this metadata to the tags.

I use my zune as a guest and don't use the software for anything other than a means to an end, i.e. getting music on the device.

Anyone have any ideas? I didn't see anything in the settings that seemed set wrong (nothing is checked under "Media Settings").

Thanks!