Back out pending_bridge_callbacks_mutex in previous commit