Revert to unmodified upstream