Synchronized with the source at 7c48eafbc7ddf865adba733328618a82f5d2e9fb.