Partially revert last commit - fix on ItemHandler coming soon