Includes missing changes to 79bdfbe25a81bf7845aff12e340a9bee6bb3a89f.