Revert to upstream for PR