My FixMap will do this.

Click here to return to ADFS Trick Disc