Revert "Make uname support more intuitive"

This reverts commit 82932c60dd54479e871f6a4394dd1ed94d630a27.