Revert "Keep the Waypoint Ids stable. Fixes #2341"

This reverts commit 6335693959709d1d1f6cd08379e70b726731809a.

The fix caused problems that were partially fixed in the master branch,
but the changes are too broad to integrate in the release branch.
Merge branch 'release'

This is an administrative merge with strategy "ours" to acknowledge
that #2341 will not be fixed in the release branch.