Revert "Performance tuning."

This reverts commit decf11cdeabca96f0d916766f9c69daffe1016f1.