Revert "merged dev"

This reverts commit 28a5c932f08479986df193bc46dc577b54d4310c.
Revert "Fixed mod based itemsink inhand config"

This reverts commit c358dfd94c54475e3205a6bfe02aa38f6ec0a188.