This reverts 192447 because of compiler warning generated on darwin build.