Synchronized with the source at e098c4c520a2163108a4a9a8a47ae5be5f04b399.