Revert "Merge pull request #167 from jugimaster/jukka-10951-flame"

This reverts commit 08d1a85540327adc62ac3326eed7346baf22558d, reversing
changes made to c9a856db6bc9e4fca528a033425242d6af8b185d.