Fixes #4762: Reverted automatic ID fix.