Exactly!
The only logical way out of the flammable/inflammable mess is to use 'flammable' and 'non-inflammable', which makes me so mad.