This should remove fire entirely, not just stop the damage.
Merge remote-tracking branch 'origin/master'