Revert inventory changes in preparation for pulled CraftBukkit commit