This is required by the spec, so let's stop returning random IDs in favor of a simple sequential integer sequence. (cherry picked from commit 0e1256e5a405627fda18b597d8fd08073dd60b77)