Reverting fix for #489 while we debate the issue more fully....