Revert "temp fix for fenji(possibly not correct)"

This reverts commit b5bd38c2a24e582d42662bb24cbe89d91c81015d.