Synchronized with the source at 21051027b8949539ed75ead5173f3224c74dd7e7.