Synchronized with the source at 9f1b39ba5df8c09d24161d45464bb3dfdec1217e.