This commit was SVN r8533.
deprecated. They offer the _ version as not deprecated, so let's use what they provide. This commit was SVN r8470.
This commit was SVN r8405.