Remove the "Ugly hack" that was the second use of dirfd().