Revert "Merge pull request #3 from bsmedberg/combiner"

This reverts commit 3ab6b4d54072da46a9e7fa2c45d1f1075b68c595, reversing
changes made to 43cca2d5295bc60341d905d5190977422b960b37.