Revised the new fix for bug 243 to something gentler and less potentially
far-reaching.  Testing desired.