Tweak r196646

There was already a condition earlier in the function so just place the check
there.

Cleanup only.