Revert "New logic for QS"

This reverts commit 862734a4a6a3639b3f863275f564fbb9b35499d7.