Revert Ghassan to upstream.