Resolves: RHEL-20172
Note: there are follow up patches which fix Hurd wrt this change,
but those lead to a rabbit hole of other required fixes that
become more and more invasive... One relevant change was to move
the tests specific to this change, but there has been no further
work upstream on those tests, so leaving that out should not
affect future merges.