Revert "Performance improvements."

This reverts commit dd9d87d783736b6f1669fcd7a2de01807d5cf795.