Revert "Use uname -s instead of uname -o to be compatible with older FreeBSD"

This reverts commit 3ff5946290dd1a09743c40bb852172b4c0e05588.