Sync with 0bba59.