Revert "optimization"

This reverts commit 8adbe74a557fa6a23351738d0d5c4ad3fc7cda5a.