Reverting the NBT storage hacks

sadly.