Revert use camera wrapper