Optimizing ad infinitum
Revert "Optimizing ad infinitum"

This reverts commit 1ba47400cc49231689284256009358d240749621.
Revert "Revert "Optimizing ad infinitum""

This reverts commit b5bb67acc477b201bbb2c0595225978758d40ed9.
Merge remote-tracking branch 'origin/master'