Synchronized with the source at 06ed2a78da4a2f48324ce452dea56c859ea53dbd.