Revert master to upstream