moses: revert bad fix