Revert "Minor optimization"

This reverts commit c244542d550555a60f095c3783a989e7d63f33fc.