Synchronized with the source at 9423edbbe7032e8851be05e4ed00d432ece28ba3.