[3.9] Remove eval calls