Revert "Reduce code size of Camera, correct error with speed"

This reverts commit 9b11928acedf434d426f0561caf95f08afb7c0a6.
We only keep the "correct error with speed" in Camera