Revert "Core/Items: Workaround for #4"

This reverts commit 4c21eca53cd31cb11af80cb5e56e446544ae902b.