Attempt to fix Issue 929: [Regression] Automatic Bridge Detach does not work