Revert "Made bundle usable with both (ODM or ORM)"
Merge pull request #85 from floriansemm/revert-79-master

Revert "Made bundle usable with both (ODM or ORM)"