Core/Items: Partial revert on last commit