Reverted botched refactoring of Kick and actionatorsdata