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

Revert "Ildipo/performance"