This reverts commit f1e3be15.

Johannes Berg <johannes@sipsolutions.net> thinks that this patch is
incorrect.  I'll defer to his judgment.
Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>