Revert "more qs fixing .."

This reverts commit f844862aa8845f5a579411b34e8c6a3c0ce7e39a.