re-fix still incomplete qs patchset

Change-Id: Ic17d48d8fdc8b94abecb2d3dcbe1ffa0b996b9d3