brd 7793b47479 Revert parts of r337849 and r337857
This fixes the build and I will redo these changes as part of a future review
that organizes them differently.  The way I tried to do it here could be done
better.  Sorry for the noise.

Approved by:	will (mentor)
Differential Revision:	https://reviews.freebsd.org/D16737
2018-08-15 23:18:34 +00:00
..
2017-02-28 23:42:47 +00:00
2017-02-28 23:42:47 +00:00
2018-07-15 21:55:17 +00:00
2017-02-28 23:42:47 +00:00
2017-02-28 23:42:47 +00:00
2017-02-28 23:42:47 +00:00
2018-07-15 21:55:17 +00:00
2018-07-15 21:55:17 +00:00
2017-02-28 23:42:47 +00:00
2017-02-28 23:42:47 +00:00
2017-02-28 23:42:47 +00:00
2018-07-15 21:55:17 +00:00
2018-08-15 23:18:34 +00:00
2017-02-28 23:42:47 +00:00
2017-02-28 23:42:47 +00:00