Synced with the source at 6413649b1c010d828ac300aee79994a9afba4543.