Sync with c98995.