Revert "Merge pull request #1622 from jwhonce/wip/cartridge_repository"

This reverts commit 1239657e65d3e9d144648e1cfcd48711b040b6a7, reversing
changes made to 95f4a9d574d870c8e5c8045533c383fff57ff6cd.