Revert "Camera and QS fix"

This reverts commit c5f88abb329f2a0363c030b28478011af7dada28.