Rewrite of most of what was inadvertently deleted.