171e2ccf99
This reverts commit 808a560be6a71dd0d27f29c26f9fefb5e809d373. causes build warnings under visual studio Change-Id: I2e49a75d72469f316e8b01929b783e6f727f756c