Sync with 0e12d3.