My changes in r96548 were too radical, stripping of edit commits (oops!) and rollback...