CORE: refactor 5fc7dc4 to work properly with tractor