Revert "Set execution environment as well."

This reverts commit f2cd77bf474153025f5726ea3f1f4f7e86f59c89.