Synchronized with the source at 8fcfadc351ea2386c3c8b568f35cd8964fad8293.