Pre-r660 we didn't have this line, and things worked better. Also see

Troy Engel's comments in Issue 936.  If this commit isn't
satisfactory, perhaps try Troy's suggestion.

Fixes Issue 936.