This commit fixes some inaccuracies introduced by
the automatic merge process when migrating changes
from previous versions to 10.9.