Revert "Merge pull request #2 from newleaders/multiflow"