Revert "Upstream merge"