Sync with 90c81c.