1) revert code which introduced crash on quitting