Revert merge from 2.3 alpha 1 release branch; the change does not

apply to the trunk.