Revert 625ac56..97dd4b3

This rolls back to commit 625ac564f7ed74cdbefab3030679f777cf8e9cf7.
Second camera picker not working