Revert "Rollback id access"

This reverts commit 7313ecdf6c2b23103bb5252bd2c89a9af43ee517.