Revert to aosp camera