Synchronized with the source at 4f6a518298a42830c67de5372e2f3728ba65d704.