Comment 4 for bug 885998

I just checked the change that David posted and it breaks retrieval of EC2 facts.

In the upstream repository (as of d62e079489c07201cb343f2ca109fecd62d6e567, and later refactored in cc67a0148b97e315572cdb905476df1224a78dd5) the can_connect? method started only being called if a couple of additional checks passed.

I'm looking for a good way to back-port some of these changes.