This reverts commit 47390e03d6. It is one of two potential candidates for the APPENDUID regression that John Wiegley reported. We need to examine this carefully before reintroducing this patch. Resolved Changelog.draft.rst conflict.
47390e03d6