Revert "Fix QS"

This reverts commit 4b0725268f7b4291727eb76b2d6806bae63f8da2.

Change-Id: I93203e50ea7e4a5ea1b979172fc359289dcaa10e