CPT for Drug Screens - 80100 and 80101

From CMS for 2010, from what I can gather, these two codes are both being done away with to be replaced by GXXX1 and GXXX2. Can any one tell me: if 80101 will still be applicable to bill for each drug class if multiple drug classes are indicated.