Revert 342139b..46b25b0

This rolls back to commit 342139bb3c0f15c6e774dd75bed28e7139698687.
Camera integrated
Camera