[server-1.20-branch] Revert !487
That does not seem to be related to commit 249a12c5 because there is no
ID_PATH in the udev export. Yet that commit depends on two other dependent changes (commit 5c96eb5f and commit 74b7427c) which are more likely the cause of the issue.
Revert the 3 commits from !487 (merged) to fix the regression until the issues is fixed in master.