Remove occasional double object feelings

I think this closes #1819.  If anyone saw this fix actually committed briefly, you were imagining things.