Revert "Derp"

This reverts commit 2bed90d7b4278d3f3e429623ba28e3183d9f8ce9.
Revert "CM10 camera hack"

This reverts commit 2c876f4bebef06a9f506645ce0178b8f3101ce96.