Merge pull request #466 from zzorba/revert-465-revert-455-mut_gen_fix…

…_double_sided_main_scheme

Revert "Revert "[mut_gen] fix double sided main_scheme""