Revert "Merge branch 'master' into FlexBridgeBeta"

This reverts commit d9a67635b72d60b201be73cb611250f4db2c97a3, reversing
changes made to b361adae35bafbfc88e761cb2f3cac324e590d73.