Revert "unclobbered some more"

This reverts commit afc53ef79d9665b7934098b4f5638f80985a78d2.