Revert feb8de8..4d49318

This rolls back to commit feb8de892396ed3bad6c252fe0d1ac983080ef92.
The camera now shows up, but it won't call onActivtyResult