Revert "Uberhack the Sony camera"

dis kernel ain't got no time for dat my boy

This partially reverts commit 1bca2380035299131e775ed30f2687b6dd7c7732.
Fix merge derps