Revert "Start converging from upstream"

This reverts commit c2eae1737a83746dba2f3a835bacfcb91b6b3f25.