Revert "S4 patch - credit kszaq"

This reverts commit ecfa1991154b5d56ae362543effad7ab10d56c24.

Conflicts:
	products/common.mk