Revert "separable variables again with e-i and e+i"

This reverts commit 0777963acb52f8c2ec26ccf05b22a394406a18ac.