Synced with the source at c05c828.