Revert "Merge pull request #395 from sarchila/master"

This reverts commit ef529578cc5dd5142cfb907dbe67dbeefa625288, reversing
changes made to c599674a87f9044da959d5f2381147f5ce95aebe.
Revert "Merge pull request #392 from sarchila/master"

This reverts commit c599674a87f9044da959d5f2381147f5ce95aebe, reversing
changes made to 3914e0c58187f26d6e64472581bb00b70c0ba056.
Merge pull request #396 from saponifi3d/josh-revert-collections

Josh revert bad merges