Revert to upstream