undo copy-and-paste

Fixes #885.

In my mind, a prereq for #796, though I'm not really clear on what direction we want there.