Revert "Improve ItemStack filtering"

This reverts commit 962b35bd3a6f0e3d0ca0b7c1b5d7418995df124f. 1.6.4 was
not quite ready for this yet