BC logic to handle DoctrineBridge < 2.6