Synced with the source at 13cc31f39f16f77463fde3233a4e366d19389693.