Revert "Workaround: assigning temporary negative IDs fixes the issue"

This reverts commit 641dee197cd0b4e6ccb027d69dd0482810553759.