(Camera) Make it more backwards-compatible