[minor] Integrate the old code