This reverts commit b65f813c1a. As a side effect this also seems to fix wtap which seems to have lost the epoch over the input path in between. Sponsored by: The FreeBSD Foundation (cherry picked from commit 1c6dd33d26eb02c6145383a49150965eeca61120)
b65f813c1a