Revert "possibly faster loading, since possibly we don't need the tags anymore, maybe faster, why do I pre-optimize tho oh well"

This reverts commit 7bf49abd5d7d33c19bb8ae0c6335c065decec920.

I think it broke something maybe, so punt for now