Fix camera as done at upstream?