Built from revision d6fd9ed00e926e0f8011236d7de4fc3f52f095a5.