I have reverted this change, it caused lockups when interrupting Suricata. See bug https://redmine.openinfosecfoundation.org/issues/988