Revert "Minor performance optimization"

This reverts commit d16b650fe5d6264bad1be32e04bcfb48d0dc690c.