I accidentally merged an incomplete version of the patch...

This reverts commit b4d59a93.
Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>