Drop UserFactor and migrate back to CheetahFactor