bug 1056380 - avoid double-attach
Merge pull request #1661 from zombie/1056380-double-attach

bug 1056380 - prevent double-attach, r=@jsantell