back off perf fix and submit via separate pull request