Revert "Revert "Ildipo/performance""
Merge pull request #861 from twosigma/revert-859-revert-831-ildipo/performance

Revert "Revert "Ildipo/performance""