Synchronized with the source at a8726010150b98d12b6dea19bdee6a153c902d12.