PEOPLE covergirl and "Will & Grace" costar Madonna has reworked her scrubbed "American Life" video to present a tamer, nonviolent version, reports the Associated Press.

The original "American Life" video, from the CD of the same name (which hits stores on Tuesday), contained a strong anti-war theme and a finale showing Madonna lobbing an explosive into the lap of a President Bush look-alike.

Madonna withdrew that version, saying it seemed inappropriate for these times.

The new version, which premiered Wednesday night on VH1, features Madonna garbed in military uniform, singing in front of a backdrop of ever-changing flags of different countries. How appropriate.

Billboard also reports that Madonna, 44, is seeking to clamp down on online peer-to-peer piracy of her new "American Life," by flooding file-sharing networks with decoy files.

In one instance, those who download tracks on some services are greeted by the voice of Madonna asking, "What the (bleep) do you think you're doing?"