Revert "Remove unused patches surrounding subclasses of the Camera"

This reverts commit aa5ea94648d6fac676f374ef6b46bac0ef0d9358.

This is causing big troubles. I misjudged this one, big time.