Revert system.prop change - useless

Change-Id: I460c99682122a10faa78107acad61dc605de3316