This reverts commit 86107fd1.

This patch inadvertantly changed the userland ABI.
Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>