Revert "Back to legacy camera"

This reverts commit 4e4f48925468360fe9a1d245bdc591489ad0dd19.