Sync with ffffd6.