672dbdb968
This is a redo of r267424, which was reverted in r267432 because it broke "make buildworld" from FreeBSD 9.x. This issue has been resolved and this change is still "make tinderbox" clean.