Sync with df3cb5.