Synchronized with the source at 9c0c24cb88dca7f36962d65be6dac0ad824a6a70.