Core/Items: partial revert on last commit