Revert "Make holder classes and stat tracker fully cooperable"

This reverts commit d2eaef0cd3b37bb271032f53a8da23a6252e6b4b.