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