Revert changes from upstream that are no longer necessary