One patch was hardcoded for NetBSD, return it closer to intention without breaking NetBSD. It's still not great, but a little better.