minor changes pre-review
removing the changes from #2822