revert introduction of tornado (until I understand how to use it ;) )