Revert "Try to fix build on recent CURRENT, from log at"

This reverts commit e00e69d3a17e648c489d5cae166f7f6bcb8bff1a.

Fixes for 10.0 (mostly libc++) will first go into the freebsd-current
branch.