Revert "Manual merge of changes from upstream"

This reverts commit 8a63a337067c620d8cca45df5a16f80c9d8c0cf3.