Revert "Being OCD about unused imports/variables, removed ambiguous ItemStack data"

This reverts commit dd3ca640ae38b95dc4bb8f78654c01dcc20472cf.