revert recovery, move fuji-common