Fixed TargetReg issue causing build failure for x86. This reverts commit 9e82bd3f. Change-Id: I7e6a526954467aaf68deeed999880dfe9aa5f06e