Revert "Using ShortId for the item id."

This reverts commit a791b5fd33bc3a6660dfeb68e5cd04d6fa0ca914.
Adding patch support.