Revert "3.4/develop"

Reverts cyrgit/minion#1