This reverts commit 25f27a4f
because of bsd-user breakage.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>