Synchronized with the source at ec7610cad9a1b78bb90767c5cb5175dc68f6e2a9.