[TEMP] Revert NBT changes for Wand