Revert EntityItem changes from death glitch commit. Fixes issue #136.