Revert "minor optimization"

This reverts commit af3d9ed749743ad5d1f1e87ccadb0b9e7082a2b5.