This reverts commit 663cb47c.

This patch was merged out of the proper order, so instead of fixing a
problem with a prior (unmerged) patch, it creates one.  Ooops!
Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>