S4 patch - credit kszaq
Revert "QSCP"

This reverts commit 6a475cf5a7c82f6dd07ca50271aea813218de3a5.

Conflicts:
	products/common.mk