Revert "one more optimization"

This reverts commit e852def8747d905ce87aaa150941127addb8cfcd.