Improve performance
Revert "Improve performance"

This reverts commit ced422c58cdb56aeebc73f22ab1122ab196e712e.