Ooops - revert a few bits
Ooops - revert a few bits

Included some bits in the last commit that shouldn't have been in
there...

ListFranz/picamera,waveform80/picamera,rocky1001/picamera,tfroehlich82/picamera