Revert "Convert existing id to string while checking for oid assignment"

This reverts commit d1d3af9279d5f37822c07ab7c56d498b9b022b4a.