some fine-tuning of generated code optimization...
Revert "some fine-tuning of generated code optimization..."

This reverts commit 292ae18466a36e1ed1422436fa91eb4e7a4cb902.