revert some changes in ProductKeyCheck

Change-Id: Ic244d5d66eb2df7a34fe7dabb1a2b15438c34a95
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>