Updating for bad behavior on trunk version.