Revert "Fixup Camera overlays"

This reverts commit b0ca51408e276bbeea8f8c7d0ab2daaa7fc43930.