Revert "Collectables simplified"

This reverts commit 173c476308264a426647f1dd75a33559bcc1d646.