Tweak logic from previous commit. (trunk r14858)