Fix a bridging bug by adding state about what kind of bridging we are doing.