revert some changes to upstream