1 comment and 1 commented out bug tweak from my perf diagnosis