Reverted a8992f523de8898: Fixed performance issue.
(cherry picked from commit 3046258)