Reverted "Fixed NBTRef"