This reverts commit d76032ae. breaks 32-bit builds Change-Id: If6266ec2a405b5a21d615112f0f37e8a71193858