Sync with 4e71a8.