This reverts commit cd87a2d3.

Author reports it conflicts with proper fixes, applied hereafter.
Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>