Revert "Fixed held item switch bug"

This reverts commit c3ec2a0794b63b11a9f4d063241a6488c1b65b5b.