revert: no measurable perf change
- redo refactoring that was useful