This reverts commit 4dff523a.

It was reported that this patch cause issues when trying to connect to
legacy devices so reverting it.
Reported-by: NDavid Fries <david@fries.net>
Signed-off-by: NGustavo F. Padovan <padovan@profusion.mobi>