updates that should make things out on aries happier This commit was SVN r6963.
This commit was SVN r6957.