Synchronized with the source at 31e57046733bedd315f82d00abcde21ba335b24c.